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.1 |
7 VERSION=4.6.2 |
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 |
93 CONFIG += headerexport symbian_no_export_sqlite |
94 shared { |
94 shared { |
95 DEFINES+=QT_MAKEDLL |
95 DEFINES+=QT_MAKEDLL |
96 TARGET.CAPABILITY = All -Tcb |
96 TARGET.CAPABILITY = All -Tcb |
97 |
97 |
98 defBlock = \ |
98 defBlock = \ |
103 "$${LITERAL_HASH}endif" |
103 "$${LITERAL_HASH}endif" |
104 |
104 |
105 contains(QT_CONFIG, private_tests) { |
105 contains(QT_CONFIG, private_tests) { |
106 #When building autotest configuration, there are extra exports from |
106 #When building autotest configuration, there are extra exports from |
107 #the Qt DLLs, which we don't want in the frozen DEF files. |
107 #the Qt DLLs, which we don't want in the frozen DEF files. |
108 |
108 MMP_RULES += EXPORTUNFROZEN |
109 # :QTP:Always use DEF files |
|
110 # MMP_RULES += EXPORTUNFROZEN |
|
111 MMP_RULES += defBlock |
|
112 } else { |
109 } else { |
113 #When building without autotests, DEF files are used by default. |
110 #When building without autotests, DEF files are used by default. |
114 #This is to maintain binary compatibility with previous releases. |
111 #This is to maintain binary compatibility with previous releases. |
115 |
112 |
116 #with defBlock enabled, removed exported symbols are treated as errors |
113 #with defBlock enabled, removed exported symbols are treated as errors |