Changeset 561 for trunk/mkspecs/features/mac

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• mkspecs/features/mac/default_post.prf (modified) (1 diff)
• mkspecs/features/mac/objective_c.prf (modified) (2 diffs)

trunk/mkspecs/features/mac/default_post.prf

@@ -1 +1 @@
 load(default_post)
 !no_objective_c:CONFIG += objective_c
+
+# Pick a suitable default architecture for qmake-based applications.
+# If the Qt package contains one of x86 and x86_64, pick that one. If it
+# contains both then use the compiler default. Make a similiar decision for
+# PowerPC-based systems. Note that this logic assumes that Qt has been 
+# configured with an architecture that is usable on the system.
+qt:!isEmpty(QT_CONFIG) {
+    contains(QMAKE_HOST.arch, ppc) {
+        !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc
+        contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64
+    } else {
+        !contains(QT_CONFIG, x86_64):contains(QT_CONFIG, x86):CONFIG += x86
+        contains(QT_CONFIG, x86_64):!contains(QT_CONFIG, x86):CONFIG += x86_64
+    }
+}

trunk/mkspecs/features/mac/objective_c.prf

@@ -1 +1 @@
 
 isEmpty(QMAKE_OBJECTIVE_CC):QMAKE_OBJECTIVE_CC = $$QMAKE_CC
-isEmpty(QMAKE_OBJECTIVE_CFLAGS) { #bootstrap
     QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS
     QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -10 +9 @@
     QMAKE_OBJECTIVE_CFLAGS_PPC = $$QMAKE_CFLAGS_PPC
     QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
-}
+
 OBJECTIVE_C_OBJECTS_DIR = $$OBJECTS_DIR
 isEmpty(OBJECTIVE_C_OBJECTS_DIR):OBJECTIVE_C_OBJECTS_DIR = .