diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-09-25 17:04:55 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-09-27 09:50:22 +0200 |
| commit | 7b5d701f310eb66af8f0846721ab67c79475ad22 (patch) | |
| tree | 1037166bade5f36b3ace37e4f23538355c237120 /src/tools/qmlpuppet | |
| parent | 2afcd57fbc210c6576086538df1da8f28f2b16d6 (diff) | |
| download | qt-creator-7b5d701f310eb66af8f0846721ab67c79475ad22.tar.gz | |
QmlDesigner: compile fix qmlpuppet with Qt 5
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.
Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit fee6b56a7cde1065637856f70a1e26f8fa7909e8)
Diffstat (limited to 'src/tools/qmlpuppet')
| -rw-r--r-- | src/tools/qmlpuppet/qmlpuppet.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet.pro index 8fadbfe12f..1041787b7a 100644 --- a/src/tools/qmlpuppet/qmlpuppet.pro +++ b/src/tools/qmlpuppet/qmlpuppet.pro @@ -3,8 +3,13 @@ TEMPLATE = subdirs include(../../../qtcreator.pri) include(../../private_headers.pri) -exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { - minQtVersion(4, 7, 1) { - SUBDIRS += qmlpuppet +greaterThan(QT_MAJOR_VERSION, 4) { + QT += qtquick1-private core-private + SUBDIRS += qmlpuppet +} else { + exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { + minQtVersion(4, 7, 1) { + SUBDIRS += qmlpuppet + } } } |