feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Plugins: Update Qt version checks

Browse Source 
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 <Thomas.Hartmann@nokia.com>
This commit is contained in:
Kai Koehne
2012-08-29 11:51:35 +02:00
parent 8ceff27cc6
commit d6dee16060
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/plugins.pro
View File

@@ -67,20 +67,14 @@ contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
include(../private_headers.pri) include(../private_headers.pri)
exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
minQtVersion(4, 7, 1) {
SUBDIRS += plugin_qmldesigner SUBDIRS += plugin_qmldesigner
} else {
warning()
warning("QmlDesigner plugin has been disabled.")
warning("QmlDesigner requires Qt 4.7.1 or later.")
}
} else { } else {
warning()
warning("QmlDesigner plugin has been disabled.") warning("QmlDesigner plugin has been disabled.")
warning("The plugin depends on private headers from QtDeclarative module.") 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("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) include (debugger/lldb/guest/qtcreator-lldb.pri)