diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-15 11:50:16 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-04-15 13:03:20 +0200 |
| commit | 891f7029457c5135c365ec32c06e7750abaceeab (patch) | |
| tree | 0bf15a932ea3176b7b7da2fd6276c00e1da9d9b5 /tools/v4 | |
| parent | db78a10ea2537141e58740bd179db19183d236e8 (diff) | |
Fix compilation with built-in v4vm JS engine
Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tools/v4')
| -rw-r--r-- | tools/v4/main.cpp | 18 | ||||
| -rw-r--r-- | tools/v4/v4.pro | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp index e61931cea4..3a91e59291 100644 --- a/tools/v4/main.cpp +++ b/tools/v4/main.cpp @@ -43,21 +43,21 @@ # include "private/qv4_llvm_p.h" #endif // QMLJS_WITH_LLVM -#include "private/debugging.h" -#include "private/qv4object.h" -#include "private/qv4runtime.h" -#include "private/qv4functionobject.h" -#include "private/qv4errorobject.h" -#include "private/qv4globalobject.h" +#include "private/qv4debugging_p.h" +#include "private/qv4object_p.h" +#include "private/qv4runtime_p.h" +#include "private/qv4functionobject_p.h" +#include "private/qv4errorobject_p.h" +#include "private/qv4globalobject_p.h" #include "private/qv4codegen_p.h" #include "private/qv4isel_masm_p.h" #include "private/qv4isel_moth_p.h" #include "private/qv4vme_moth_p.h" #include "private/qv4syntaxchecker_p.h" -#include "private/qv4objectproto.h" +#include "private/qv4objectproto_p.h" #include "private/qv4isel_p.h" -#include "private/qv4mm.h" -#include "private/qv4context.h" +#include "private/qv4mm_p.h" +#include "private/qv4context_p.h" #include <QtCore> #include <private/qqmljsengine_p.h> diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro index fcf1b28582..9ed6d3f2f4 100644 --- a/tools/v4/v4.pro +++ b/tools/v4/v4.pro @@ -1,8 +1,10 @@ TEMPLATE = app -QT = v4-private core-private qmldevtools-private +QT = qml-private core-private SOURCES = main.cpp -include(../../src/v4/v4.pri) +include($$PWD/../../src/3rdparty/masm/masm-defs.pri) + +CONFIG += exceptions llvm-libs { DEFINES += QMLJS_WITH_LLVM |