summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-01-17 14:49:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-27 17:03:57 +0100
commit90c8d1ac47d9f31dcd3301f185b7659235bb35d4 (patch)
treeb292b0699d7c2a63576a759bc0706550e5d9a6fd /Source/JavaScriptCore
parent630919aa6c959a775f0b570c8f1702292cc3d5fa (diff)
downloadqtwebkit-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>
Diffstat (limited to 'Source/JavaScriptCore')
-rw-r--r--Source/JavaScriptCore/Target.pri2
1 files changed, 1 insertions, 1 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)}