diff options
| author | David Faure <faure@kde.org> | 2014-02-27 22:22:17 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2014-03-01 11:26:34 +0100 |
| commit | 6437231041d3dac38bc60e36b1196acf46f8f35c (patch) | |
| tree | 8d65e08f62b8dbb4a351b6fc7e538868361fb667 /src/core | |
| parent | 3eb5f0433f79f0c0fda49e00898cd93d3bd73b67 (diff) | |
| download | kconfig-6437231041d3dac38bc60e36b1196acf46f8f35c.tar.gz kconfig-6437231041d3dac38bc60e36b1196acf46f8f35c.tar.bz2 | |
we use Qt5 now, so re-enable -DQT_NO_CAST_FROM_BYTEARRAY
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/kconfig.cpp | 3 | ||||
| -rw-r--r-- | src/core/kconfiggroup.cpp | 3 | ||||
| -rw-r--r-- | src/core/kdesktopfile.cpp | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 5b5fa3a7..fa2075c4 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -20,9 +20,6 @@ Boston, MA 02110-1301, USA. */ -// Qt5 TODO: re-enable. No point in doing it before, it breaks on QString::fromUtf8(QByteArray), which exists in qt5. -#undef QT_NO_CAST_FROM_BYTEARRAY - #include "kconfig.h" #include "kconfig_p.h" diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp index 14d27f94..5161bc79 100644 --- a/src/core/kconfiggroup.cpp +++ b/src/core/kconfiggroup.cpp @@ -20,9 +20,6 @@ Boston, MA 02110-1301, USA. */ -// Qt5 TODO: re-enable. No point in doing it before, it breaks on QString::fromUtf8(QByteArray), which exists in qt5. -#undef QT_NO_CAST_FROM_BYTEARRAY - #include "kconfiggroup.h" #include "kconfiggroup_p.h" diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp index 9fa3654d..ea0419f6 100644 --- a/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp @@ -19,9 +19,6 @@ Boston, MA 02110-1301, USA. */ -// Qt5 TODO: re-enable. No point in doing it before, it breaks on QString::fromUtf8(QByteArray), which exists in qt5. -#undef QT_NO_CAST_FROM_BYTEARRAY - #include "kdesktopfile.h" #ifndef Q_OS_WIN |