equal
deleted
inserted
replaced
2 INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat |
2 INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat |
3 !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR |
3 !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR |
4 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 |
4 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 |
5 TEMPLATE = lib |
5 TEMPLATE = lib |
6 isEmpty(QT_MAJOR_VERSION) { |
6 isEmpty(QT_MAJOR_VERSION) { |
7 VERSION=4.6.3 |
7 VERSION=4.7.0 |
8 } else { |
8 } else { |
9 VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} |
9 VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} |
10 } |
10 } |
11 mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm |
11 mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm |
12 |
12 |
88 CONFIG += zlib |
88 CONFIG += zlib |
89 INCLUDEPATH += tmp |
89 INCLUDEPATH += tmp |
90 !static: DEFINES+=QT_MAKEDLL |
90 !static: DEFINES+=QT_MAKEDLL |
91 } |
91 } |
92 symbian { |
92 symbian { |
|
93 DEFINES += QT_QCHAR_CONSTRUCTOR |
93 # load the environment specific feature definitions |
94 # load the environment specific feature definitions |
94 exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) { |
95 exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) { |
95 load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) |
96 load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) |
96 } |
97 } |
97 |
98 |
107 # WARNING - disabling DEF files *will* break BC with previous released versions |
108 # WARNING - disabling DEF files *will* break BC with previous released versions |
108 # of Qt, and the only compatibility will be between this build of Qt and anything |
109 # of Qt, and the only compatibility will be between this build of Qt and anything |
109 # built in this exact environment. *Never* use this when building a version |
110 # built in this exact environment. *Never* use this when building a version |
110 # for release. |
111 # for release. |
111 contains(CONFIG, def_files) { |
112 contains(CONFIG, def_files) { |
112 defFilePath=../s60installs |
113 DEF_FILE=../s60installs |
113 } |
114 } |
114 } |
115 } |
115 load(armcc_warnings) |
116 load(armcc_warnings) |
116 |
117 |
117 # workaround for the fact that some of our required includes in Symbian^3 |
118 # workaround for the fact that some of our required includes in Symbian^3 |
160 |
161 |
161 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE |
162 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE |
162 DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS |
163 DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS |
163 contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT |
164 contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT |
164 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code |
165 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code |
|
166 DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION |
165 |
167 |
166 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |
168 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |
167 |
169 |
168 moc_dir.name = moc_location |
170 moc_dir.name = moc_location |
169 moc_dir.variable = QMAKE_MOC |
171 moc_dir.variable = QMAKE_MOC |