diff options
| author | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-28 10:53:15 +0300 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-28 10:55:31 +0300 |
| commit | f3e5445040ea595ecd24c19bd6f27dc832c71067 (patch) | |
| tree | 9740b35237a635f665712166f224803cfbf703d8 | |
| parent | 50f3e49f9fd4e9807cd4e82316848ba8d2c7540e (diff) | |
Revert "Change: Enable qt string optimizations also for applications depending on meegotouch"
This reverts commit 79b37e5b3b5d201aeac0a0a1a65be4ce80869452.
| -rw-r--r-- | mgen/mgen.pro | 3 | ||||
| -rw-r--r-- | mkspecs/common.pri | 3 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch.prf | 3 | ||||
| -rw-r--r-- | mthemedaemon/mthemedaemon.pro | 3 | ||||
| -rw-r--r-- | src/common_top.pri | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/mgen/mgen.pro b/mgen/mgen.pro index 0e3cfd86..3a1943a0 100644 --- a/mgen/mgen.pro +++ b/mgen/mgen.pro @@ -6,6 +6,9 @@ target.path = $$M_INSTALL_BIN INCLUDEPATH += . DEPENDPATH += $$INCLUDEPATH +# enable QString optimizations +DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS + # Check for mixing of const and non-const iterators, # which can cause problems when built with some compilers: DEFINES += QT_STRICT_ITERATORS diff --git a/mkspecs/common.pri b/mkspecs/common.pri index ab784120..f93d6293 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -36,9 +36,6 @@ mac { # Load global definitions include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf) -# enable QString optimizations -DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS - # Defines for directories, for use in source code. { # THEMEDIR determines the location of the theme diff --git a/mkspecs/features/meegotouch.prf b/mkspecs/features/meegotouch.prf index ff16c25f..c433ac9d 100644 --- a/mkspecs/features/meegotouch.prf +++ b/mkspecs/features/meegotouch.prf @@ -56,6 +56,3 @@ macx { QMAKE_EXTRA_COMPILERS += mgenerator_style } } - -# enable string optimizations -DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS diff --git a/mthemedaemon/mthemedaemon.pro b/mthemedaemon/mthemedaemon.pro index 98bcdbb6..4a572d90 100644 --- a/mthemedaemon/mthemedaemon.pro +++ b/mthemedaemon/mthemedaemon.pro @@ -16,6 +16,9 @@ QT += svg network DEFINES += MTHEME_PRINT_DEBUG #DEFINES += CLOSE_ON_ENTER +# enable QString optimizations +DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS + # Check for mixing of const and non-const iterators, # which can cause problems when built with some compilers: DEFINES += QT_STRICT_ITERATORS diff --git a/src/common_top.pri b/src/common_top.pri index 583e4ea3..0217fdd0 100644 --- a/src/common_top.pri +++ b/src/common_top.pri @@ -42,6 +42,9 @@ QMAKE_CXXFLAGS += -DM_EXPORTS macx:LIBS -= -lX11 win32:LIBS -= -lX11 +# enable QString optimizations +DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS + # Check for mixing of const and non-const iterators, # which can cause problems when built with some compilers: DEFINES += QT_STRICT_ITERATORS |