diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-01-17 14:49:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-27 17:03:57 +0100 |
| commit | 90c8d1ac47d9f31dcd3301f185b7659235bb35d4 (patch) | |
| tree | b292b0699d7c2a63576a759bc0706550e5d9a6fd | |
| parent | 630919aa6c959a775f0b570c8f1702292cc3d5fa (diff) | |
| download | qtwebkit-90c8d1ac47d9f31dcd3301f185b7659235bb35d4.tar.gz | |
Replace win32-g++ with mingw scope
Commit 773dd01 in qtbase introduced a general mingw platform scope, which
is cleaner and more flexible than matching the spec name.
(see 278152fff for a similar commit in qtbase).
Change-Id: Id3dcd3474504aebeee16dc41cd1eeab7ac21b319
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/JavaScriptCore/Target.pri | 2 | ||||
| -rw-r--r-- | Source/WebCore/Target.pri | 2 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/production_build.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/win32/default_post.prf | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri index 12fd19ca6..47415a774 100644 --- a/Source/JavaScriptCore/Target.pri +++ b/Source/JavaScriptCore/Target.pri @@ -341,7 +341,7 @@ linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { disassembler/udis86/udis86_syn.c \ } -win32:!win32-g++*:isEqual(QT_ARCH, "x86_64"):{ +win32:!mingw:isEqual(QT_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)} diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index fc717b348..9b162f620 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -4251,7 +4251,7 @@ use?(ZLIB) { SOURCES += $${SQLITE3SRCDIR}/sqlite3.c } -win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{ +win32:!mingw: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)} diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 7ed8aa3ae..43b655ad6 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -203,7 +203,7 @@ enable?(WEB_AUDIO) { use?(3D_GRAPHICS) { win32: { - win32-g++*: { + mingw: { # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols contains(QT_CONFIG, opengles2) { CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { diff --git a/Tools/qmake/mkspecs/features/production_build.prf b/Tools/qmake/mkspecs/features/production_build.prf index 478d1e770..903600338 100644 --- a/Tools/qmake/mkspecs/features/production_build.prf +++ b/Tools/qmake/mkspecs/features/production_build.prf @@ -7,7 +7,7 @@ CONFIG *= use_all_in_one_files # resulting in the need of several gigabytes of memory at link-time. Reduce the pressure # by compiling any static library like WTF or JSC with release flags instead and keep debug # symbols for the static libraries that implement API. -if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|win32-g++*:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib { +if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib { !equals(TARGET, WebKit2):!equals(TARGET, WebKitWidgets) { CONFIG += no_debug_info CONFIG -= separate_debug_info diff --git a/Tools/qmake/mkspecs/features/win32/default_post.prf b/Tools/qmake/mkspecs/features/win32/default_post.prf index acf2e861b..8c8ac750b 100644 --- a/Tools/qmake/mkspecs/features/win32/default_post.prf +++ b/Tools/qmake/mkspecs/features/win32/default_post.prf @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC -win32-g++* { +mingw { TMPPATH = $$quote($$(INCLUDE)) QMAKE_INCDIR_POST += $$split(TMPPATH,";") TMPPATH = $$quote($$(LIB)) |