Changeset 561 for trunk/src/qbase.pri

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/qbase.pri (modified) (6 diffs)

trunk/src/qbase.pri

@@ -12 +12 @@
 CONFIG += qt_install_headers
 HEADERS_PRI = $$QT_BUILD_TREE/include/$$TARGET/headers.pri
-include($$HEADERS_PRI)|clear(HEADERS_PRI)
+include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
 
 #version overriding
@@ -35 +35 @@
 CONFIG          -= fix_output_dirs
 win32|mac:!macx-xcode:CONFIG += debug_and_release
-linux-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
@@ -66 +66 @@
 mac {
    CONFIG += explicitlib
-   true { #we want to use O2 on Qt itself (Os was used to fix other failures in older GCC)
-      QMAKE_CFLAGS_RELEASE ~= s,-Os,-O2,
-      QMAKE_CXXFLAGS_RELEASE ~= s,-Os,-O2,
-      QMAKE_OBJECTIVE_CFLAGS_RELEASE ~= s,-Os,-O2,
-   }
    macx-g++ {
        QMAKE_CFLAGS += -fconstant-cfstrings
@@ -93 +88 @@
     !static: DEFINES+=QT_MAKEDLL
 }
+symbian {
+    shared {
+        DEFINES+=QT_MAKEDLL
+        TARGET.CAPABILITY = All -Tcb
+
+        defBlock = \
+        "$${LITERAL_HASH}ifdef WINSCW" \
+        "DEFFILE ../s60installs/bwins/$${TARGET}.def" \
+        "$${LITERAL_HASH}elif defined EABI" \
+        "DEFFILE ../s60installs/eabi/$${TARGET}.def" \
+        "$${LITERAL_HASH}endif"
+
+        contains(QT_CONFIG, private_tests) {
+            #When building autotest configuration, there are extra exports from
+            #the Qt DLLs, which we don't want in the frozen DEF files.
+            MMP_RULES += EXPORTUNFROZEN
+        } else {
+            #When building without autotests, DEF files are used by default.
+            #This is to maintain binary compatibility with previous releases.
+            
+            #with defBlock enabled, removed exported symbols are treated as errors
+            #and there is binary compatibility between successive builds.
+            #with defBlock disabled, binary compatibility is broken every time you build
+            MMP_RULES += defBlock
+
+            #with EXPORTUNFROZEN enabled, new exports are included in the dll without
+            #needing to run abld freeze, however binary compatibility is only maintained
+            #for symbols that are frozen (and only if defBlock is also enabled)
+            #the downside of EXPORTUNFROZEN is that the linker gets run twice
+            #MMP_RULES += EXPORTUNFROZEN
+        }
+    }
+    load(armcc_warnings)
+}
 win32-borland:INCLUDEPATH += kernel
 
@@ -114 +143 @@
 include(qt_install.pri)
 
-unix {
+unix:!symbian {
    CONFIG     += create_libtool create_pc explicitlib
    QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS]
@@ -134 +163 @@
 
 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
-DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
+DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
 contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT
 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code