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.2 |
7 VERSION=4.6.3 |
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 CONFIG += headerexport symbian_no_export_sqlite |
93 # load the environment specific feature definitions |
|
94 exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) { |
|
95 load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) |
|
96 } |
|
97 |
94 shared { |
98 shared { |
95 DEFINES+=QT_MAKEDLL |
99 DEFINES+=QT_MAKEDLL |
96 TARGET.CAPABILITY = All -Tcb |
100 TARGET.CAPABILITY = All -Tcb |
97 |
101 |
98 # When building without autotests, DEF files are used by default. |
102 # When building without autotests, DEF files are used by default. |
107 contains(CONFIG, def_files) { |
111 contains(CONFIG, def_files) { |
108 defFilePath=../s60installs |
112 defFilePath=../s60installs |
109 } |
113 } |
110 } |
114 } |
111 load(armcc_warnings) |
115 load(armcc_warnings) |
|
116 |
|
117 # workaround for the fact that some of our required includes in Symbian^3 |
|
118 # now depend upon files in epoc32/include/platform |
|
119 INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE |
112 } |
120 } |
113 win32-borland:INCLUDEPATH += kernel |
121 win32-borland:INCLUDEPATH += kernel |
114 |
122 |
115 aix-g++* { |
123 aix-g++* { |
116 QMAKE_CFLAGS += -mminimal-toc |
124 QMAKE_CFLAGS += -mminimal-toc |