File qt-4.7.4-webkit.patch of Package mingw32-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt-4.7.4-webkit.patch of Package mingw32-libqt4 (Revision c3ad5bdbc7ad4addfde889a7357ea877)

Currently displaying revision c3ad5bdbc7ad4addfde889a7357ea877 , Show latest

--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2011-08-23 14:02:27.000000000 +0200
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2011-09-13 20:48:54.978081376 +0200
@@ -75,7 +75,7 @@
     # Argument is the relative path to JavaScriptCore.pro's qmake output
     pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
 
-    win32-msvc*|wince* {
+    win32-*|wince* {
         LIBS += -L$$pathToJavaScriptCoreOutput
         LIBS += -l$$JAVASCRIPTCORE_TARGET
         POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${JAVASCRIPTCORE_TARGET}.lib
--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro	2011-08-23 14:02:27.000000000 +0200
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro	2011-09-13 20:48:38.617446758 +0200
@@ -43,7 +43,7 @@
 }
 
 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
-win32-g++* {
+win32*-g++* {
     TMPPATH            = $$quote($$(INCLUDE))
     QMAKE_INCDIR_POST += $$split(TMPPATH,";")
     TMPPATH            = $$quote($$(LIB))
--- src/3rdparty/webkit/WebCore/WebCore.pro	2011-08-23 14:02:27.000000000 +0200
+++ src/3rdparty/webkit/WebCore/WebCore.pro	2011-09-13 20:46:16.919512236 +0200
@@ -109,7 +109,7 @@
 }
 
 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
-win32-g++* {
+win32-*g++* {
     TMPPATH            = $$quote($$(INCLUDE))
     QMAKE_INCDIR_POST += $$split(TMPPATH,";")
     TMPPATH            = $$quote($$(LIB))
@@ -2957,7 +2957,7 @@
     CONFIG += no_debug_info
 }
 
-win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
+win32:!win32*-g++*:contains(QMAKE_HOST.arch, x86_64):{
     asm_compiler.commands = ml64 /c
     asm_compiler.commands +=  /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
     asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}

Places

File qt-4.7.4-webkit.patch of Package mingw32-libqt4 (Revision c3ad5bdbc7ad4addfde889a7357ea877)

Places