From 20927cbc98cf6bda8dab9ab5f3753f59855752bc Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 13 Mar 2015 12:47:16 +0100 Subject: Remove QQmlDirParser from QtQmlDevTools This class is not needed in the library. Change-Id: Ie880086a849b62a2856d1f388a64d363b040cb56 Reviewed-by: Frederik Gladhorn Reviewed-by: Oswald Buddenhagen --- src/qmldevtools/qmldevtools.pro | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qmldevtools/qmldevtools.pro') diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 5af5443df7..589b90a71f 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -22,4 +22,3 @@ 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 From 6767fcfaf234bc3e0f92f156fa68266d0aac7d4a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 9 Mar 2015 16:39:32 +0100 Subject: Fix usage of QtQmlDevTools private headers on OSX with framework builds Previously this module borrowed its private headers from QtQml, so that when writing QT += qmldevtools-private, you'd get the private headers from QtQml. This doesn't work when QtQml is built as a framework. A cleaner solution is to give this module its headers proper by letting syncqt create the forwarding headers correctly (and consequently also include them in make install). In order for this to work, the included headers themselves cannot include any headers from QtQml, which this patch also takes care of, through a centralized inclusion of qv4global_p.h. Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785 Reviewed-by: Oswald Buddenhagen Reviewed-by: Frederik Gladhorn --- src/qmldevtools/qmldevtools.pro | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/qmldevtools/qmldevtools.pro') diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 589b90a71f..df1b750282 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -1,14 +1,11 @@ option(host_build) TARGET = QtQmlDevTools QT = core -CONFIG += static no_module_headers internal_module qmldevtools_build +CONFIG += static internal_module qmldevtools_build -MODULE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE \ - \$\$QT_MODULE_INCLUDE_BASE/QtQml -MODULE_PRIVATE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION \ - \$\$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION/QtQml +# Don't use pch because the auto-generated header refers to QtBootstrap, +# which doesn't exist +CONFIG -= precompile_header # 2415: variable "xx" of static storage duration was declared but never referenced # unused variable 'xx' [-Werror,-Wunused-const-variable] -- cgit v1.2.3