Changeset 846 for trunk/src/script/script.pro

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/script/script.pro (modified) (3 diffs)

trunk/src/script/script.pro

@@ -41 +41 @@
 }
 
+mac {
+    DEFINES += ENABLE_JSC_MULTIPLE_THREADS=0
+    LIBS_PRIVATE += -framework AppKit
+}
+
 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri)
 
@@ -70 +75 @@
 
 # Avoid JSC C API functions being exported.
-DEFINES += JS_EXPORT="" JS_EXPORTDATA=""
+DEFINES += JS_NO_EXPORT
 
 INCLUDEPATH += $$PWD
@@ -76 +81 @@
 include(script.pri)
 
-symbian:TARGET.UID3=0x2001B2E1
+symbian {
+    TARGET.UID3=0x2001B2E1
+}
+
+symbian {
+    symbian-abld|symbian-sbsv2 {
+        MMP_RULES += ALWAYS_BUILD_AS_ARM
+    }  else {
+        QMAKE_CFLAGS -= --thumb
+        QMAKE_CXXFLAGS -= --thumb
+    }
+    QMAKE_CXXFLAGS.ARMCC += -OTime -O3
+}
+
+# WebKit doesn't compile in C++0x mode
+*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x