From 6437231041d3dac38bc60e36b1196acf46f8f35c Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 27 Feb 2014 22:22:17 +0100 Subject: we use Qt5 now, so re-enable -DQT_NO_CAST_FROM_BYTEARRAY --- src/core/kconfig.cpp | 3 --- src/core/kconfiggroup.cpp | 3 --- src/core/kdesktopfile.cpp | 3 --- 3 files changed, 9 deletions(-) (limited to 'src') 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 -- cgit v1.2.1