From c4e3699862c32347a1023bc3abfbd1a5d2b913e6 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 22 Sep 2010 12:28:51 +0200 Subject: 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. --- src/plugins/plugins.pro | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src') 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() } } -- cgit v1.2.1