feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix qmldump compile with external QT_PRIVATE_HEADERS

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-06-14 12:56:01 +02:00
parent 47885c114b
commit b3a1e36cc4
6 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/plugins.pro
View File

@@ -39,7 +39,7 @@ contains(QT_CONFIG, declarative) {
SUBDIRS += plugin_qmlprojectmanager SUBDIRS += plugin_qmlprojectmanager
include(private_headers.pri) include(../private_headers.pri)
exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) { exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
SUBDIRS += plugin_qmldesigner \ SUBDIRS += plugin_qmldesigner \
plugin_qmlinspector plugin_qmlinspector

2
src/plugins/qmldesigner/fxplugin/fxplugin.pro
View File

@@ -1,4 +1,4 @@
include(../../../../qtcreator.pri) include(../../../../qtcreator.pri)
include(../../private_headers.pri) include(../../../private_headers.pri)
include(fxplugin.pri) include(fxplugin.pri)
include(plugindestdir.pri) include(plugindestdir.pri)

2
src/plugins/qmldesigner/qmldesignerplugin.pro
View File

@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = QmlDesigner TARGET = QmlDesigner
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(../private_headers.pri) include(../../private_headers.pri)
include(qmldesigner_dependencies.pri) include(qmldesigner_dependencies.pri)
include(../qmljseditor/qmljseditor.pri) include(../qmljseditor/qmljseditor.pri)

2
src/plugins/qmlinspector/qmlinspector.pro
View File

@@ -4,7 +4,7 @@ TARGET = QmlInspector
INCLUDEPATH += . INCLUDEPATH += .
DEPENDPATH += . DEPENDPATH += .
include(../private_headers.pri) include(../../private_headers.pri)
include(components/qmldebugger.pri) include(components/qmldebugger.pri)
DEFINES += QMLINSPECTOR_LIBRARY DEFINES += QMLINSPECTOR_LIBRARY

0
src/plugins/private_headers.pri → src/private_headers.pri
View File

1
src/tools/qml/qmldump/qmldump.pro
View File

@@ -14,5 +14,6 @@ TEMPLATE = app
SOURCES += main.cpp SOURCES += main.cpp
include(../../../../qtcreator.pri) include(../../../../qtcreator.pri)
include(../../../private_headers.pri)
DESTDIR = $$IDE_BIN_PATH DESTDIR = $$IDE_BIN_PATH
include(../../../rpath.pri) include(../../../rpath.pri)