aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/plugins.pro
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-13 17:06:10 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-16 13:36:58 +0200
commitdce623b1bf026df0680b359bc8e36ce928e7aea1 (patch)
tree0fd32e38c7ebcae2491207ad32de6c7d7b54ed87 /src/plugins/plugins.pro
parentcf56178df17db9a4840e52627ec89532c76c41e5 (diff)
QmlDesigner: Porting to Qt Quick 2
This patch ports our Qt Quick views to Qt Quick 2. Change-Id: Ie0cfd81e7ebb76d2ed667211ad063feaaff5aa14 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/plugins.pro')
-rw-r--r--src/plugins/plugins.pro13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 51cd8994d1..95de5cf33c 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -67,20 +67,13 @@ contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
qmlprojectmanager \
qmlprofiler
- greaterThan(QT_MAJOR_VERSION, 4) {
+ greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 0) {
SUBDIRS += \
qmldesigner \
welcome
} else {
- include(../private_headers.pri)
- exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
- SUBDIRS += \
- qmldesigner
- } else {
- 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("QmlDesigner plugin has been disabled.")
+ warning("The plugin needs at least Qt 5.1.")
}
} else {
warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative")