diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-09 16:39:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:27:07 +0000 |
| commit | 6767fcfaf234bc3e0f92f156fa68266d0aac7d4a (patch) | |
| tree | 760b539969d20ba53210ec592946756d5c5a5f17 /src/qmldevtools/qmldevtools.pro | |
| parent | 20927cbc98cf6bda8dab9ab5f3753f59855752bc (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src/qmldevtools/qmldevtools.pro')
| -rw-r--r-- | src/qmldevtools/qmldevtools.pro | 11 |
1 files changed, 4 insertions, 7 deletions
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] |