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.0 |
7 VERSION=4.6.1 |
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 |
34 |
34 |
35 CONFIG += qt warn_on depend_includepath |
35 CONFIG += qt warn_on depend_includepath |
36 CONFIG += qmake_cache target_qt |
36 CONFIG += qmake_cache target_qt |
37 CONFIG -= fix_output_dirs |
37 CONFIG -= fix_output_dirs |
38 win32|mac:!macx-xcode:CONFIG += debug_and_release |
38 win32|mac:!macx-xcode:CONFIG += debug_and_release |
39 linux-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF |
39 linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF |
40 |
40 |
41 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols |
41 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols |
42 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions |
42 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions |
43 contains(QT_CONFIG, largefile):CONFIG += largefile |
43 contains(QT_CONFIG, largefile):CONFIG += largefile |
44 |
44 |
100 "DEFFILE ../s60installs/bwins/$${TARGET}.def" \ |
100 "DEFFILE ../s60installs/bwins/$${TARGET}.def" \ |
101 "$${LITERAL_HASH}elif defined EABI" \ |
101 "$${LITERAL_HASH}elif defined EABI" \ |
102 "DEFFILE ../s60installs/eabi/$${TARGET}.def" \ |
102 "DEFFILE ../s60installs/eabi/$${TARGET}.def" \ |
103 "$${LITERAL_HASH}endif" |
103 "$${LITERAL_HASH}endif" |
104 |
104 |
105 #with defBlock enabled, removed exported symbols are treated as errors |
105 contains(QT_CONFIG, private_tests) { |
106 #and there is binary compatibility between successive builds. |
106 #When building autotest configuration, there are extra exports from |
107 #with defBlock disabled, binary compatibility is broken every time you build |
107 #the Qt DLLs, which we don't want in the frozen DEF files. |
108 MMP_RULES += defBlock |
108 |
109 |
109 # :QTP:Always use DEF files |
110 #with EXPORTUNFROZEN enabled, new exports are included in the dll without |
110 # MMP_RULES += EXPORTUNFROZEN |
111 #needing to run abld freeze, however binary compatibility is only maintained |
111 MMP_RULES += defBlock |
112 #for symbols that are frozen (and only if defBlock is also enabled) |
112 } else { |
113 #the downside of EXPORTUNFROZEN is that the linker gets run twice |
113 #When building without autotests, DEF files are used by default. |
114 #MMP_RULES += EXPORTUNFROZEN |
114 #This is to maintain binary compatibility with previous releases. |
|
115 |
|
116 #with defBlock enabled, removed exported symbols are treated as errors |
|
117 #and there is binary compatibility between successive builds. |
|
118 #with defBlock disabled, binary compatibility is broken every time you build |
|
119 MMP_RULES += defBlock |
|
120 |
|
121 #with EXPORTUNFROZEN enabled, new exports are included in the dll without |
|
122 #needing to run abld freeze, however binary compatibility is only maintained |
|
123 #for symbols that are frozen (and only if defBlock is also enabled) |
|
124 #the downside of EXPORTUNFROZEN is that the linker gets run twice |
|
125 #MMP_RULES += EXPORTUNFROZEN |
|
126 } |
115 } |
127 } |
116 load(armcc_warnings) |
128 load(armcc_warnings) |
117 } |
129 } |
118 win32-borland:INCLUDEPATH += kernel |
130 win32-borland:INCLUDEPATH += kernel |
119 |
131 |