diff --git a/share/qtcreator/qmljsdebugger/private_headers.pri b/share/qtcreator/qmljsdebugger/private_headers.pri new file mode 100644 index 0000000000000000000000000000000000000000..fc3539617814dc72b088a83cc32b219458e0f6d9 --- /dev/null +++ b/share/qtcreator/qmljsdebugger/private_headers.pri @@ -0,0 +1,17 @@ +# Try to find location of Qt private headers (see README) +isEmpty(QT_PRIVATE_HEADERS) { + QT_PRIVATE_HEADERS = $$[QT_INSTALL_HEADERS] +} + +INCLUDEPATH += \ + $${QT_PRIVATE_HEADERS} \ + $${QT_PRIVATE_HEADERS}/QtCore \ + $${QT_PRIVATE_HEADERS}/QtGui \ + $${QT_PRIVATE_HEADERS}/QtScript \ + $${QT_PRIVATE_HEADERS}/QtDeclarative +DEPENDPATH += \ + $${QT_PRIVATE_HEADERS} \ + $${QT_PRIVATE_HEADERS}/QtCore \ + $${QT_PRIVATE_HEADERS}/QtGui \ + $${QT_PRIVATE_HEADERS}/QtScript \ + $${QT_PRIVATE_HEADERS}/QtDeclarative diff --git a/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri index a39a2a415ebbfd370fabaf65c9ef00f021d39de4..1ca47b8b7f1c6242238a2967e4a8259f952e3c27 100644 --- a/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri +++ b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri @@ -8,9 +8,7 @@ contains(CONFIG, dll) { DEFINES += BUILD_QMLJSDEBUGGER_STATIC_LIB } -## Once is not enough -include($$PWD/../../../src/private_headers.pri) -include($$PWD/../../../src/private_headers.pri) +include($$PWD/private_headers.pri) include($$PWD/editor/editor.pri) diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index f3c229c84a16eb38c690ea160fd9ac5f3824b589..92c0bc40b69e2940e0570e7aec9733d5668655e2 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -32,7 +32,8 @@ DATA_DIRS = \ gdbmacros \ qmldesigner \ qmlicons \ - qml-type-descriptions + qml-type-descriptions \ + qmljsdebugger !isEmpty(copydata) {