fix qmldump compile with external QT_PRIVATE_HEADERS

2010-06-14 12:56:01 +02:00
parent 47885c114b
commit b3a1e36cc4
6 changed files with 5 additions and 4 deletions
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -39,7 +39,7 @@ contains(QT_CONFIG, declarative) {

    SUBDIRS += plugin_qmlprojectmanager

-    include(private_headers.pri)
+    include(../private_headers.pri)
    exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
        SUBDIRS += plugin_qmldesigner \
                   plugin_qmlinspector
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.pro
+++ b/src/plugins/qmldesigner/fxplugin/fxplugin.pro
@@ -1,4 +1,4 @@
 include(../../../../qtcreator.pri)
-include(../../private_headers.pri)
+include(../../../private_headers.pri)
 include(fxplugin.pri)
 include(plugindestdir.pri)
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = QmlDesigner

 include(../../qtcreatorplugin.pri)
-include(../private_headers.pri)
+include(../../private_headers.pri)
 include(qmldesigner_dependencies.pri)
 include(../qmljseditor/qmljseditor.pri)

--- a/src/plugins/qmlinspector/qmlinspector.pro
+++ b/src/plugins/qmlinspector/qmlinspector.pro
@@ -4,7 +4,7 @@ TARGET = QmlInspector
 INCLUDEPATH += .
 DEPENDPATH += .

-include(../private_headers.pri)
+include(../../private_headers.pri)
 include(components/qmldebugger.pri)

 DEFINES += QMLINSPECTOR_LIBRARY
--- a/src/plugins/private_headers.pri
+++ b/src/plugins/private_headers.pri
--- a/src/tools/qml/qmldump/qmldump.pro
+++ b/src/tools/qml/qmldump/qmldump.pro
@@ -14,5 +14,6 @@ TEMPLATE = app
 SOURCES += main.cpp

 include(../../../../qtcreator.pri)
+include(../../../private_headers.pri)
 DESTDIR = $$IDE_BIN_PATH
 include(../../../rpath.pri)