diff --git a/share/share.pro b/share/share.pro
index 27e70952671ae5f2545f6fdd6cf175e4462f38b8..69509a0098b86bc5788fb4fe04d875ebf6a07965 100644
--- a/share/share.pro
+++ b/share/share.pro
@@ -1,15 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
           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.")
-    }
-}
diff --git a/src/tools/qml/qml.pro b/src/tools/qml/qml.pro
index f82097f097df7f3d2ac2857d4609350d690e751e..5af8d71c73b77732252186aeb812344c565380d4 100644
--- a/src/tools/qml/qml.pro
+++ b/src/tools/qml/qml.pro
@@ -4,7 +4,8 @@ contains(QT_CONFIG, declarative) {
 
     include(../../private_headers.pri)
     exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativemetatype_p.h) {
-        SUBDIRS += qmldump qmlobserver
+        SUBDIRS += qmldump ../../../share/qtcreator/qmljsdebugger qmlobserver
+        CONFIG += ordered
     } else {
         warning()
         warning("QmlDump utility has been disabled")