Disable everything QML-related but QMLJSEditor by default

To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake

Reviewed-by: Kai Koehne

1 files changed, 22 insertions, 15 deletions

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 156d5ce9f8..c8bbb792ed 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -35,21 +35,28 @@ SUBDIRS   = plugin_coreplugin \
             plugin_mercurial \
             debugger/dumper.pro
 
-contains(QT_CONFIG, declarative) {
-
-    SUBDIRS += plugin_qmlprojectmanager
-
-    include(private_headers.pri)
-    exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
-        SUBDIRS += plugin_qmldesigner \
-                   plugin_qmlinspector
-    } else {
-        warning()
-        warning("QmlDesigner and QmlInspector plugins have been disabled")
-        warning("The plugins depend on on private headers from QtDeclarative module.")
-        warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
-        warning()
-    }
+SUPPORT_QT_QML = $$(QTCREATOR_WITH_QML)
+
+!isEmpty(SUPPORT_QT_QML) {
+    message("Adding support for Qt/QML projects.")
+    DEFINES += QTCREATOR_WITH_QML
+
+    contains(QT_CONFIG, declarative) {
+
+        SUBDIRS += plugin_qmlprojectmanager
+
+        include(private_headers.pri)
+        exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
+            SUBDIRS += plugin_qmldesigner \
+                       plugin_qmlinspector
+        } else {
+            warning()
+            warning("QmlDesigner and QmlInspector plugins have been disabled")
+            warning("The plugins depend on on private headers from QtDeclarative module.")
+            warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
+            warning()
+       }
+   }
 }
 
 plugin_coreplugin.subdir = coreplugin