From 0f8251e133d0b7e6710cd251991d35ca803a16ad Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 25 Jun 2014 15:13:45 +0200
Subject: [PATCH] QmlDesigner: Skip QmlDesigner for Qt < 5.3
Otherwise it will not build because it requires QQuickWidget.
Change-Id: Idbe40355af3ca3507268e7d002b04e76d90c45b1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
README | 4 +++-
src/plugins/plugins.pro | 9 +++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/README b/README
index ae411270f5e..ebc8a6c03ca 100644
--- a/README
+++ b/README
@@ -12,7 +12,9 @@ Mac OS X 10.7 or later
Building the sources requires Qt 5.2.0 or later.
It is also possible to build with Qt 4.8.x, but in that case the Welcome mode,
-Qt Quick Designer, QML Profiler, and the WinRT and Qbs support are disabled.
+QML Profiler, and the WinRT and Qbs support are disabled.
+The Qt Quick Designer can only be compiled with Qt 5.3.1 or later , because
+it requires QQuickWidget.
Compiling Qt Creator
====================
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 61a62462277..a8d0d6c8807 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -76,13 +76,18 @@ isEmpty(IDE_PACKAGE_MODE) {
updateinfo
}
+minQtVersion(5, 3, 1) {
+ SUBDIRS += qmldesigner
+} else {
+ warning("QmlDesigner plugin has been disabled.")
+ warning("This plugin requires Qt 5.3.1 or newer.")
+}
+
minQtVersion(5, 2, 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.2.")
--
GitLab