From 38ab088cb171afec563dfeb7eec6da31919f4d28 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 16 Sep 2013 16:16:52 +0200
Subject: [PATCH] plugins: Simplify checks for declarative
We can expect people with Qt 5.1 to also have QtQuick.
Change-Id: I84b0323c6ea11b46f3ee41c0bbdc5f059643f208
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/plugins.pro | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 73cf7b15e9b..ffd8fc3068d 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -31,6 +31,7 @@ SUBDIRS = \
resourceeditor \
genericprojectmanager \
qmljseditor \
+ qmlprojectmanager \
glsleditor \
pythoneditor \
mercurial \
@@ -62,23 +63,16 @@ isEmpty(IDE_PACKAGE_MODE) {
updateinfo
}
-contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
+minQtVersion(5, 1, 0) {
SUBDIRS += \
- qmlprojectmanager
-
- greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 0) {
- SUBDIRS += \
- qmldesigner \
- qmlprofiler \
- welcome
- } else {
- warning("QmlDesigner plugin has been disabled.")
- warning("QmlProfiler plugin has been disabled.")
- warning("Welcome plugin has been disabled.")
- warning("These plugins need at least Qt 5.1.")
- }
+ qmldesigner \
+ qmlprofiler \
+ welcome
} else {
- warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative")
+ warning("QmlDesigner plugin has been disabled.")
+ warning("QmlProfiler plugin has been disabled.")
+ warning("Welcome plugin has been disabled.")
+ warning("These plugins need at least Qt 5.1.")
}
for(p, SUBDIRS) {
--
GitLab