summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-armcc
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-20 09:41:11 (GMT)
committeraxis <qt-info@nokia.com>2011-03-04 10:30:36 (GMT)
commit2ad80c0149477a6ca7dd69a7243c2055d208c98d (patch)
tree43450bd02ded2a68259cc9284c43a20fd19ae439 /mkspecs/symbian-armcc
parentb83cbadc80b24107433709f4827e1619a0e7561b (diff)
downloadQt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.zip
Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.tar.gz
Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.tar.bz2
Added Symbian deployment localization for makefile build system.
This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/symbian-armcc')
-rw-r--r--mkspecs/symbian-armcc/qmake.conf5
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/symbian-armcc/qmake.conf b/mkspecs/symbian-armcc/qmake.conf
index be6af39..77a1966 100644
--- a/mkspecs/symbian-armcc/qmake.conf
+++ b/mkspecs/symbian-armcc/qmake.conf
@@ -53,10 +53,7 @@ INCLUDEPATH = $${EPOCROOT}epoc32/include \
exists($${EPOCROOT}epoc32/include/rvct2_2) {
INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct2_2
- QMAKE_CFLAGS += --preinclude rvct2_2.h
- QMAKE_CXXFLAGS += --preinclude rvct2_2.h
+ DEFINES *= __QT_RVCT_HEADER_IS_2_2__
} else {
INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct
- QMAKE_CFLAGS += --preinclude rvct.h
- QMAKE_CXXFLAGS += --preinclude rvct.h
}