diff options
| author | Armin Berres <armin.berres@basyskom.de> | 2010-04-22 15:35:04 +0200 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-04-28 10:25:23 +0300 |
| commit | 79b37e5b3b5d201aeac0a0a1a65be4ce80869452 (patch) | |
| tree | 942558d5e6257600ddcdbfe23b2180246b9de2e6 | |
| parent | 3a26407781a1806463e90ec43824b0d57fd5e7c0 (diff) | |
Change: Enable qt string optimizations also for applications depending on meegotouch
RevBy: Holger Schröder, Tomas
Details: Right now every application has to enable the fast string operations on
their own. As libmeegotouch does heavy use of string enabling this flag
really makes sense.
With this commit it is not needed anymore that every depending app sets the
flag on their own.
| -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, 6 insertions, 9 deletions
diff --git a/mgen/mgen.pro b/mgen/mgen.pro index 3a1943a0..0e3cfd86 100644 --- a/mgen/mgen.pro +++ b/mgen/mgen.pro @@ -6,9 +6,6 @@ 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 f93d6293..ab784120 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -36,6 +36,9 @@ 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 c433ac9d..ff16c25f 100644 --- a/mkspecs/features/meegotouch.prf +++ b/mkspecs/features/meegotouch.prf @@ -56,3 +56,6 @@ 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 e1871173..753cba8b 100644 --- a/mthemedaemon/mthemedaemon.pro +++ b/mthemedaemon/mthemedaemon.pro @@ -16,9 +16,6 @@ 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 0217fdd0..583e4ea3 100644 --- a/src/common_top.pri +++ b/src/common_top.pri @@ -42,9 +42,6 @@ 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 |