diff options
author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-09-22 12:28:51 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-09-22 12:28:51 +0200 |
commit | c4e3699862c32347a1023bc3abfbd1a5d2b913e6 (patch) | |
tree | 3f63b941eae4eb32183573ef1ce68b9883e6ccd3 /src | |
parent | 1da46d81ee5bf4432f476134122aff7e68fd1037 (diff) | |
download | qt-creator-c4e3699862c32347a1023bc3abfbd1a5d2b913e6.tar.gz |
QmlDesigner: compile fix - 4.7.1 reqeuired for Bauhaus
Since Bauhaus still does rely on Qt internals in only
compiles with 4.7.1.
Fixes also spelling.
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/plugins.pro | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index d325fc8834..400e593f79 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -46,13 +46,18 @@ contains(QT_CONFIG, declarative) { include(../private_headers.pri) exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { - SUBDIRS += plugin_qmldesigner + isEqual(QT_MINOR_VERSION, 7):greaterThan(QT_PATCH_VERSION, 0) { + SUBDIRS += plugin_qmldesigner + } else { + warning() + warning("QmlDesigner plugin has been disabled.") + warning("Qt Version has to be 4.7.x with x > 0") + } } else { warning() - warning("QmlDesigner plugin has been disabled") - warning("The plugin depends on on private headers from QtDeclarative module.") + warning("QmlDesigner plugin has been disabled.") + warning("The plugin depends on private headers from QtDeclarative module.") warning("To enable it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.") - warning() } } |