Added private header check

share/share.pro

 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
-          qtcreator/translations \
-          qtcreator/qmljsdebugger
+          qtcreator/translations
+
+contains(QT_CONFIG, declarative) {
+    include(../src/private_headers.pri)
+    exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativemetatype_p.h) {
+            SUBDIRS += qtcreator/qmljsdebugger
+    } else {
+        warning()
+        warning("QmlJSDebugger library has been disabled")
+        warning("This library enables extended debugging features that work together with the QML JS Inspector.")
+        warning("To enable it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
+    }
+}

src/tools/qml/qml.pro

@@ -12,7 +12,7 @@ contains(QT_CONFIG, declarative) {
         warning("This means the Qml editor will lack correct completion and type checking.")
         warning("To enable it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
         warning()
-        warning("QmlViewer has been disabled")
+        warning("QmlObserver has been disabled")
         warning("This application depends on private headers from QtDeclarative module.")
         warning("This means the QML debugging facilities will be limited.")
         warning("To enable it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")