diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlbundle/qmlbundle.pro | 2 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofiler.pro | 2 | ||||
| -rw-r--r-- | tools/tools.pro | 3 | ||||
| -rw-r--r-- | tools/v4/main.cpp | 18 | ||||
| -rw-r--r-- | tools/v4/v4.pro | 6 |
5 files changed, 17 insertions, 14 deletions
diff --git a/tools/qmlbundle/qmlbundle.pro b/tools/qmlbundle/qmlbundle.pro index 440b152149..89b7477f63 100644 --- a/tools/qmlbundle/qmlbundle.pro +++ b/tools/qmlbundle/qmlbundle.pro @@ -1,4 +1,4 @@ -QT = core qml-private v8-private core-private +QT = core qml-private core-private SOURCES += main.cpp diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro index c5def993f3..b29768f10e 100644 --- a/tools/qmlprofiler/qmlprofiler.pro +++ b/tools/qmlprofiler/qmlprofiler.pro @@ -1,4 +1,4 @@ -QT += qml qml-private v8-private network core-private +QT += qml qml-private network core-private SOURCES += main.cpp \ qmlprofilerapplication.cpp \ diff --git a/tools/tools.pro b/tools/tools.pro index 86e2f3804f..ab2d2e93df 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -4,5 +4,6 @@ qtHaveModule(qmltest): SUBDIRS += qmltestrunner SUBDIRS += \ qmlmin \ qmlprofiler \ - qmlbundle + qmlbundle \ + v4 qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing 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 |