From cb48aad9d27d83ab4ea75f4548c1d108205fecf3 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 29 Sep 2010 13:35:06 +0200
Subject: [PATCH] QmlDesigner: Improve Qt version check in plugins.pro
Reviewed-by: Thomas Hartmann
---
qtcreator.pri | 20 ++++++++++++++++++++
src/plugins/plugins.pro | 8 +++++---
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index 8b2268ca3ff..2994770571f 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -31,6 +31,26 @@ defineReplace(qtLibraryName) {
return($$RET)
}
+defineTest(minQtVersion) {
+ maj = $$1
+ min = $$2
+ patch = $$3
+ isEqual(QT_MAJOR_VERSION, $$maj) {
+ isEqual(QT_MINOR_VERSION, $$min) {
+ isEqual(QT_PATCH_VERSION, $$patch) {
+ return(true)
+ }
+ greaterThan(QT_PATCH_VERSION, $$patch) {
+ return(true)
+ }
+ }
+ greaterThan(QT_MINOR_VERSION, $$min) {
+ return(true)
+ }
+ }
+ return(false)
+}
+
# For use in custom compilers which just copy files
win32:i_flag = i
defineReplace(stripSrcDir) {
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 9702fb785d5..570be94d7e0 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -38,20 +38,22 @@ SUBDIRS = plugin_coreplugin \
plugin_tasklist \
debugger/dumper.pro
-contains(QT_CONFIG, declarative) {
+include(../../qtcreator.pri)
+contains(QT_CONFIG, declarative) {
SUBDIRS += \
plugin_qmlprojectmanager \
plugin_qmljsinspector
include(../private_headers.pri)
exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
- isEqual(QT_MINOR_VERSION, 7):greaterThan(QT_PATCH_VERSION, 0) {
+
+ minQtVersion(4, 7, 1) {
SUBDIRS += plugin_qmldesigner
} else {
warning()
warning("QmlDesigner plugin has been disabled.")
- warning("Qt Version has to be 4.7.x with x > 0")
+ warning("QmlDesigner requires Qt 4.7.1 or later.")
}
} else {
warning()
--
GitLab