From a24ac12af7497f337a2d54271c891248483041d2 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 6 Aug 2010 19:01:39 +0200
Subject: [PATCH] Fix link error of qmlobserver by adjusting build order
After qmljsdebugger was moved to share/, the build order of
qmlobserver and qmljsdebugger had to be re-adjusted.
Reviewed-By: Lasse Holmstedt
---
share/share.pro | 12 ------------
src/tools/qml/qml.pro | 3 ++-
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/share/share.pro b/share/share.pro
index 27e70952671..69509a0098b 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 f82097f097d..5af8d71c73b 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")
--
GitLab