From a885d10a0289da85b8c966d2fa40fb10edae4fd7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 12 Mar 2014 16:55:06 +0100 Subject: 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 --- src/qmldevtools/qmldevtools.pro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/qmldevtools/qmldevtools.pro') diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 963fb1be5a..25d6494558 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -1,7 +1,7 @@ option(host_build) TARGET = QtQmlDevTools QT = core -CONFIG += static no_module_headers internal_module +CONFIG += static no_module_headers internal_module qmldevtools_build MODULE_INCLUDES = \ \$\$QT_MODULE_INCLUDE_BASE \ @@ -12,4 +12,8 @@ MODULE_PRIVATE_INCLUDES = \ load(qt_module) +include(../3rdparty/masm/masm-defs.pri) include(../qml/parser/parser.pri) +include(../qml/jsruntime/jsruntime.pri) +include(../qml/compiler/compiler.pri) +include(../qml/qml/qml.pri) -- cgit v1.2.3