From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 31 Jan 2013 22:52:09 +0000 (+0100)
Subject: Avoid duplicated feature defines between tools/v4/v4.pro and src/v4/v4.pro
X-Git-Tag: upstream/5.2.1~669^2~659^2~325
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0689c111cf7286b449dba6c625d477e47d8a0d39;p=platform%2Fupstream%2Fqtdeclarative.git

Avoid duplicated feature defines between tools/v4/v4.pro and src/v4/v4.pro

Centralize the macros in v4.pri that's included by both.

Change-Id: I1ae2ed3b7b97a4e905d2e4ae563c99c964253bb1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/.gitignore b/.gitignore
index dede313..8df072a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ udis86_itab.*
 *.bc
 *.ll
 RegExpJitTables.h
+.qmake.cache
diff --git a/src/3rdparty/double-conversion/double-conversion.pri b/src/3rdparty/double-conversion/double-conversion.pri
index 8bb37c6..4ad5f9f 100644
--- a/src/3rdparty/double-conversion/double-conversion.pri
+++ b/src/3rdparty/double-conversion/double-conversion.pri
@@ -1,4 +1,4 @@
-INCLUDEPATH += $PWD
+INCLUDEPATH += $$PWD
 VPATH += $$PWD
 SOURCES += $$PWD/*.cc
 HEADERS += $$PWD/*.h
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
new file mode 100644
index 0000000..34b86e3
--- /dev/null
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -0,0 +1,24 @@
+
+DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
+
+DEFINES += ENABLE_LLINT=0
+DEFINES += ENABLE_DFG_JIT=0
+DEFINES += ENABLE_JIT=1
+DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
+DEFINES += ENABLE_ASSEMBLER=1
+DEFINES += ENABLE_YARR_JIT=0
+DEFINES += BUILDING_QT__
+
+INCLUDEPATH += $$PWD/jit
+INCLUDEPATH += $$PWD/assembler
+INCLUDEPATH += $$PWD/runtime
+INCLUDEPATH += $$PWD/wtf
+INCLUDEPATH += $$PWD/stubs
+INCLUDEPATH += $$PWD/stubs/wtf
+INCLUDEPATH += $$PWD
+
+DEFINES += WTF_USE_UDIS86=1
+INCLUDEPATH += $$PWD/disassembler
+INCLUDEPATH += $$PWD/disassembler/udis86
+INCLUDEPATH += $$_OUT_PWD
+
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index 92ad32d..f172762 100644
--- a/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -1,4 +1,3 @@
-
 HEADERS += $$PWD/assembler/*.h
 SOURCES += $$PWD/assembler/ARMAssembler.cpp
 SOURCES += $$PWD/assembler/ARMv7Assembler.cpp
@@ -31,28 +30,6 @@ HEADERS += $$PWD/wtf/PageReservation.h
 SOURCES += $$PWD/stubs/WTFStubs.cpp
 HEADERS += $$PWD/stubs/WTFStubs.h
 
-DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
-
-DEFINES += ENABLE_LLINT=0
-DEFINES += ENABLE_DFG_JIT=0
-DEFINES += ENABLE_JIT=1
-DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
-DEFINES += ENABLE_ASSEMBLER=1
-
-DEFINES += BUILDING_QT__
-
-INCLUDEPATH += $$PWD/jit
-INCLUDEPATH += $$PWD/assembler
-INCLUDEPATH += $$PWD/runtime
-INCLUDEPATH += $$PWD/wtf
-INCLUDEPATH += $$PWD/stubs
-INCLUDEPATH += $$PWD/stubs/wtf
-INCLUDEPATH += $$PWD
-
-DEFINES += WTF_USE_UDIS86=1
-INCLUDEPATH += $$PWD/disassembler
-INCLUDEPATH += $$PWD/disassembler/udis86
-INCLUDEPATH += $$_OUT_PWD
 SOURCES += $$PWD/disassembler/Disassembler.cpp
 SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp
 SOURCES += $$PWD/disassembler/udis86/udis86.c
@@ -63,7 +40,6 @@ SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c
 SOURCES += $$PWD/disassembler/udis86/udis86_syn.c
 SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c
 
-DEFINES += ENABLE_YARR_JIT=0
 SOURCES += \
     $$PWD/yarr/YarrCanonicalizeUCS2.cpp \
     $$PWD/yarr/YarrInterpreter.cpp \
diff --git a/src/v4/v4.pri b/src/v4/v4.pri
new file mode 100644
index 0000000..6f70a8c
--- /dev/null
+++ b/src/v4/v4.pri
@@ -0,0 +1,6 @@
+
+include(../3rdparty/masm/masm-defs.pri)
+
+!llvm: DEFINES += QMLJS_NO_LLVM
+
+INCLUDEPATH += $$PWD
diff --git a/src/v4/v4.pro b/src/v4/v4.pro
index fb7ea80..24832ec 100644
--- a/src/v4/v4.pro
+++ b/src/v4/v4.pro
@@ -124,11 +124,6 @@ GEN_LLVM_RUNTIME_FLAGS -= -pedantic
 gen_llvm_runtime.target = llvm_runtime
 gen_llvm_runtime.commands = clang -O2 -emit-llvm -c $(INCPATH) $$GEN_LLVM_RUNTIME_FLAGS -DQMLJS_LLVM_RUNTIME llvm_runtime.cpp -o $$LLVM_RUNTIME_BC
 
-
-} else {
-
-DEFINES += QMLJS_NO_LLVM
-
 }
 
 # Use SSE2 floating point math on 32 bit instead of the default
@@ -155,3 +150,4 @@ QMAKE_EXTRA_TARGETS += checkmothtarget
 include(moth/moth.pri)
 include(../3rdparty/masm/masm.pri)
 include(../3rdparty/double-conversion/double-conversion.pri)
+include(v4.pri)
diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro
index 0b23270..3f878fa 100644
--- a/tools/v4/v4.pro
+++ b/tools/v4/v4.pro
@@ -2,21 +2,6 @@ TEMPLATE = app
 QT = v4-private core-private qmldevtools-private
 SOURCES = main.cpp
 
-INCLUDEPATH += ../../src/v4
-INCLUDEPATH += ../../src/3rdparty/masm
-INCLUDEPATH += ../../src/3rdparty/masm/wtf
-INCLUDEPATH += ../../src/3rdparty/masm/stubs
-INCLUDEPATH += ../../src/3rdparty/masm/stubs/wtf
-INCLUDEPATH += ../../src/3rdparty/masm/jit
-INCLUDEPATH += ../../src/3rdparty/masm/assembler
-INCLUDEPATH += ../../src/3rdparty/masm/disassembler
+include(../../src/v4/v4.pri)
 
-DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
-DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 ENABLE_LLINT=0
-
-llvm {
-   # TODO LLVM support doesn't work correctly
-} else {
-    DEFINES += QMLJS_NO_LLVM
-}
 load(qt_tool)