diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-12 16:55:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-23 21:16:46 +0200 |
| commit | a885d10a0289da85b8c966d2fa40fb10edae4fd7 (patch) | |
| tree | 7c16b5abd88d436f6596d6a424126c1b1dd2aba8 /src/qml/jsruntime/jsruntime.pri | |
| parent | 937fdde5d3b26291d417f856ee05ba479a6ba730 (diff) | |
Extend the QML bootstrap library by the IR builders
This is among other things needed to fix the qml import scanner to detect
dependencies from .js files correctly.
The patch also fixes the use of Q_QML_EXPORT towards Q_QML_PRIVATE_EXPORT
where appropriate and corrects the wrong include path for the double conversion
code to actually be relative to the file it is included from. This worked by
accident because of other include paths present in the build.
Change-Id: I338583dad2f76300819af8ab0dae8e5724c84430
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/jsruntime.pri')
| -rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri index 9d5757b5a0..72010d3fa8 100644 --- a/src/qml/jsruntime/jsruntime.pri +++ b/src/qml/jsruntime/jsruntime.pri @@ -1,11 +1,10 @@ INCLUDEPATH += $$PWD INCLUDEPATH += $$OUT_PWD +!qmldevtools_build { SOURCES += \ $$PWD/qv4engine.cpp \ $$PWD/qv4context.cpp \ - $$PWD/qv4runtime.cpp \ - $$PWD/qv4value.cpp \ $$PWD/qv4persistent.cpp \ $$PWD/qv4debugging.cpp \ $$PWD/qv4lookup.cpp \ @@ -33,7 +32,6 @@ SOURCES += \ $$PWD/qv4regexpobject.cpp \ $$PWD/qv4stringobject.cpp \ $$PWD/qv4variantobject.cpp \ - $$PWD/qv4string.cpp \ $$PWD/qv4objectiterator.cpp \ $$PWD/qv4regexp.cpp \ $$PWD/qv4serialize.cpp \ @@ -50,10 +48,7 @@ HEADERS += \ $$PWD/qv4global_p.h \ $$PWD/qv4engine_p.h \ $$PWD/qv4context_p.h \ - $$PWD/qv4runtime_p.h \ $$PWD/qv4math_p.h \ - $$PWD/qv4value_inl_p.h \ - $$PWD/qv4value_p.h \ $$PWD/qv4persistent_p.h \ $$PWD/qv4debugging_p.h \ $$PWD/qv4lookup_p.h \ @@ -81,7 +76,6 @@ HEADERS += \ $$PWD/qv4regexpobject_p.h \ $$PWD/qv4stringobject_p.h \ $$PWD/qv4variantobject_p.h \ - $$PWD/qv4string_p.h \ $$PWD/qv4property_p.h \ $$PWD/qv4objectiterator_p.h \ $$PWD/qv4regexp_p.h \ @@ -97,6 +91,20 @@ HEADERS += \ $$PWD/qv4vme_moth_p.h \ $$PWD/qv4profiling_p.h +} + + +HEADERS += \ + $$PWD/qv4runtime_p.h \ + $$PWD/qv4value_inl_p.h \ + $$PWD/qv4string_p.h \ + $$PWD/qv4value_p.h + +SOURCES += \ + $$PWD/qv4runtime.cpp \ + $$PWD/qv4string.cpp \ + $$PWD/qv4value.cpp + # Use SSE2 floating point math on 32 bit instead of the default # 387 to make test results pass on 32 and on 64 bit builds. linux-g++*:isEqual(QT_ARCH,i386) { |