Commit a24ac12a authored by Alessandro Portale's avatar Alessandro Portale
Browse files

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
parent 0c77b216
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.")
}
}
......@@ -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")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment