From b3a1e36cc4356891784ae6070684904e75accfbb Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 14 Jun 2010 12:56:01 +0200
Subject: [PATCH] fix qmldump compile with external QT_PRIVATE_HEADERS

---
 src/plugins/plugins.pro                       | 2 +-
 src/plugins/qmldesigner/fxplugin/fxplugin.pro | 2 +-
 src/plugins/qmldesigner/qmldesignerplugin.pro | 2 +-
 src/plugins/qmlinspector/qmlinspector.pro     | 2 +-
 src/{plugins => }/private_headers.pri         | 0
 src/tools/qml/qmldump/qmldump.pro             | 1 +
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{plugins => }/private_headers.pri (100%)

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index f59ddb97a4d..4e91cd1a695 100644
--- 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
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.pro b/src/plugins/qmldesigner/fxplugin/fxplugin.pro
index b95f35ead65..48cd0f6adaa 100644
--- 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)
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index fc965672277..2fab725e090 100644
--- 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)
 
diff --git a/src/plugins/qmlinspector/qmlinspector.pro b/src/plugins/qmlinspector/qmlinspector.pro
index c121535a93b..cd9e5f92082 100644
--- 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
diff --git a/src/plugins/private_headers.pri b/src/private_headers.pri
similarity index 100%
rename from src/plugins/private_headers.pri
rename to src/private_headers.pri
diff --git a/src/tools/qml/qmldump/qmldump.pro b/src/tools/qml/qmldump/qmldump.pro
index 97257c718f9..d223914132d 100644
--- 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)