From d6dee160607cfe2abf680f1c88b37e42feb22a66 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 29 Aug 2012 11:51:35 +0200 Subject: [PATCH] Plugins: Update Qt version checks Remove the warning for Qt 4.7.0: The minimum version for Qt Creator is now Qt 4.7.4. Instead, warn users that the QmlX plugins won't be compiled if QtDeclarative or QtQuick1 is missing. (QtQuick1 isn't compiled by default on Qt 5). Change-Id: Ib9713282ad3759045a6eb994da1a12aac5176910 Reviewed-by: Thomas Hartmann --- src/plugins/plugins.pro | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 0047aa67f72..3268421e309 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -67,20 +67,14 @@ contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) { include(../private_headers.pri) exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { - - minQtVersion(4, 7, 1) { SUBDIRS += plugin_qmldesigner - } else { - warning() - warning("QmlDesigner plugin has been disabled.") - warning("QmlDesigner requires Qt 4.7.1 or later.") - } } else { - warning() 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.") } +} else { + warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative (Qt 4.x) or QtQuick1 (Qt 5.x)"); } include (debugger/lldb/guest/qtcreator-lldb.pri)