diff options
| author | dt <qtc-committer@nokia.com> | 2010-10-04 16:07:46 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2010-10-04 16:07:46 +0200 |
| commit | 6b6d9871b80d37c679998c332b94537e5f23d6c1 (patch) | |
| tree | c19b656a61b06da2da1e66a4fe0b4386399b6ac4 /src/plugins/plugins.pro | |
| parent | a84ad42741d4f3ac2f35ba3303f94a034f2d50ba (diff) | |
| parent | c7142affef4b4ea78306254b62da13d66f9be0af (diff) | |
| download | qt-creator-6b6d9871b80d37c679998c332b94537e5f23d6c1.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/templates/mobileapp/app.pro
share/qtcreator/templates/qmlapp/app.pro
src/plugins/cpptools/cpptools.pro
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 98d7db777b..6cbc707d37 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() |