diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-01-31 23:52:09 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-02-01 22:05:54 +0100 |
| commit | 0689c111cf7286b449dba6c625d477e47d8a0d39 (patch) | |
| tree | 36278272d96b755680d20b8edf74312aab8f03c4 /tools | |
| parent | 62663f29542c4d5139b68c1b6cf69e1275103980 (diff) | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/v4/v4.pro | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro index 0b23270f..3f878fa6 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) |