diff options
35 files changed, 9 insertions, 61 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index c80fe934d8..0d89a74624 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -127,10 +127,7 @@ INCLUDEPATH += \ $$IDE_SOURCE_TREE/tools \ $$IDE_SOURCE_TREE/src/plugins -DEPENDPATH += \ - $$IDE_SOURCE_TREE/src/libs \ - $$IDE_SOURCE_TREE/tools \ - $$IDE_SOURCE_TREE/src/plugins +CONFIG += depend_includepath LIBS += -L$$IDE_LIBRARY_PATH diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri index 570cba1da9..49e2da8ff7 100644 --- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri +++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD/include -DEPENDPATH += $$PWD $$PWD/include editor $$PWD/qt-private include($$PWD/protocol/protocol.pri) diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pri index 5743fca3ac..75bcdc56b6 100644 --- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pri +++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pri @@ -2,7 +2,6 @@ # It enables debugging of Qt Quick applications INCLUDEPATH += $$PWD/include -DEPENDPATH += $PPWD/include QT += declarative script LIBS *= -l$$qtLibraryName(QmlJSDebugger) diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri index 85cb972095..8b49cd3d0e 100644 --- a/src/libs/cplusplus/cplusplus.pri +++ b/src/libs/cplusplus/cplusplus.pri @@ -1,5 +1,3 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus -DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus -DEPENDPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus LIBS *= -l$$qtLibraryName(CPlusPlus) diff --git a/src/libs/glsl/glsl.pri b/src/libs/glsl/glsl.pri index 112d313ae6..3ff20ace08 100644 --- a/src/libs/glsl/glsl.pri +++ b/src/libs/glsl/glsl.pri @@ -1,6 +1,7 @@ -INCLUDEPATH += $$PWD/../../shared -INCLUDEPATH += $$PWD/../../shared/glsl $$PWD/../../shared/glsl/parser +INCLUDEPATH += \ + $$PWD/../../shared \ + $$PWD/../../shared/glsl \ + $$PWD/../../shared/glsl/parser -DEPENDPATH += $$PWD/../../shared/glsl $$PWD/../../shared/glsl/parser LIBS *= -l$$qtLibraryName(GLSL) DEFINES += QT_CREATOR diff --git a/src/libs/languageutils/languageutils-lib.pri b/src/libs/languageutils/languageutils-lib.pri index 59e3b6a42f..6eaa315814 100644 --- a/src/libs/languageutils/languageutils-lib.pri +++ b/src/libs/languageutils/languageutils-lib.pri @@ -4,7 +4,6 @@ contains(CONFIG, dll) { DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB } -DEPENDPATH += $$PWD INCLUDEPATH += $$PWD/.. HEADERS += \ diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri index 942e9eeb4c..1faa8eec80 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri @@ -1,6 +1,5 @@ QT += declarative script INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD contains(CONFIG, dll) { DEFINES += BUILD_QMLEDITORWIDGETS_LIB diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri index 72520ed980..55a4c3da0a 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD $$PWD/easingpane -DEPENDPATH += $$PWD $$PWD/easingpane QT += declarative LIBS *= -l$$qtLibraryName(QmlEditorWidgets) diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri index 7bd069c63a..9c5b7eec9e 100644 --- a/src/libs/qmljs/qmljs-lib.pri +++ b/src/libs/qmljs/qmljs-lib.pri @@ -6,7 +6,6 @@ contains(CONFIG, dll) { include(parser/parser.pri) -DEPENDPATH += $$PWD INCLUDEPATH += $$PWD/.. HEADERS += \ diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri index af334ef81f..20d20c513d 100644 --- a/src/libs/qmljs/qmljs.pri +++ b/src/libs/qmljs/qmljs.pri @@ -1,6 +1,7 @@ -INCLUDEPATH += $$PWD/../../shared -INCLUDEPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser +INCLUDEPATH += \ + $$PWD/../../shared \ + $$PWD/../../shared/qmljs \ + $$PWD/../../shared/qmljs/parser -DEPENDPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser LIBS *= -l$$qtLibraryName(QmlJS) DEFINES += QT_CREATOR diff --git a/src/libs/symbianutils/symbianutils.pri b/src/libs/symbianutils/symbianutils.pri index c90d4da432..978aabebdb 100644 --- a/src/libs/symbianutils/symbianutils.pri +++ b/src/libs/symbianutils/symbianutils.pri @@ -1,3 +1,2 @@ INCLUDEPATH *= $$PWD/../../shared/symbianutils -DEPENDPATH += $$PWD/../../shared/symbianutils LIBS *= -l$$qtLibraryName(symbianutils) diff --git a/src/plugins/analyzerbase/analyzerbase.pri b/src/plugins/analyzerbase/analyzerbase.pri index 7d37bb401d..82780bd242 100644 --- a/src/plugins/analyzerbase/analyzerbase.pri +++ b/src/plugins/analyzerbase/analyzerbase.pri @@ -1,5 +1,4 @@ include(analyzerbase_dependencies.pri) INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD LIBS *= -l$$qtLibraryName(AnalyzerBase) diff --git a/src/plugins/coreplugin/coreplugin.pri b/src/plugins/coreplugin/coreplugin.pri index 7db79341c3..92714693c1 100644 --- a/src/plugins/coreplugin/coreplugin.pri +++ b/src/plugins/coreplugin/coreplugin.pri @@ -2,4 +2,3 @@ include(coreplugin_dependencies.pri) LIBS *= -l$$qtLibraryName(Core) # for ide_version.h INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin -DEPENDPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index c25dcb3c43..63a4a52aba 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -16,10 +16,6 @@ INCLUDEPATH += dialogs \ editormanager \ progressmanager \ scriptmanager -DEPENDPATH += dialogs \ - actionmanager \ - editormanager \ - scriptmanager SOURCES += mainwindow.cpp \ editmode.cpp \ tabpositionindicator.cpp \ diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri index 2801ddd096..8a62bd5e6d 100644 --- a/src/plugins/debugger/cdb/cdb.pri +++ b/src/plugins/debugger/cdb/cdb.pri @@ -13,4 +13,3 @@ SOURCES += $$PWD/cdbengine.cpp \ FORMS += cdb/cdboptionspagewidget.ui INCLUDEPATH*=$$PWD -DEPENDPATH*=$$PWD diff --git a/src/plugins/debugger/debugger.pri b/src/plugins/debugger/debugger.pri index d2df959e56..357158b002 100644 --- a/src/plugins/debugger/debugger.pri +++ b/src/plugins/debugger/debugger.pri @@ -1,5 +1,4 @@ include(debugger_dependencies.pri) INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD LIBS *= -l$$qtLibraryName(Debugger) diff --git a/src/plugins/designer/cpp/cpp.pri b/src/plugins/designer/cpp/cpp.pri index 2df8138f63..a30a794022 100644 --- a/src/plugins/designer/cpp/cpp.pri +++ b/src/plugins/designer/cpp/cpp.pri @@ -1,5 +1,4 @@ INCLUDEPATH+=$$PWD -DEPENDPATH+=$$PWD DEFINES+=CPP_ENABLED diff --git a/src/plugins/git/gitorious/gitorious.pri b/src/plugins/git/gitorious/gitorious.pri index d10e09c15b..8678042a26 100644 --- a/src/plugins/git/gitorious/gitorious.pri +++ b/src/plugins/git/gitorious/gitorious.pri @@ -1,6 +1,5 @@ QT += network INCLUDEPATH+=$$PWD -DEPENDPATH+=$$PWD HEADERS += $$PWD/gitoriousclonewizard.h \ $$PWD/gitorioushostwizardpage.h \ diff --git a/src/plugins/memcheck/memcheck.pri b/src/plugins/memcheck/memcheck.pri index 85b4382fbd..9224189ba2 100644 --- a/src/plugins/memcheck/memcheck.pri +++ b/src/plugins/memcheck/memcheck.pri @@ -1,5 +1,4 @@ include(memcheck_dependencies.pri) INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD LIBS *= -l$$qtLibraryName(Memcheck) diff --git a/src/plugins/qmldesigner/designercore/depend_paths.pri b/src/plugins/qmldesigner/designercore/depend_paths.pri deleted file mode 100644 index c2059ccbec..0000000000 --- a/src/plugins/qmldesigner/designercore/depend_paths.pri +++ /dev/null @@ -1 +0,0 @@ -DEPENDPATH += $$PWD/qtpropertybrowser/src/
\ No newline at end of file diff --git a/src/plugins/qmldesigner/designercore/designercore.pri b/src/plugins/qmldesigner/designercore/designercore.pri index 7ff4acf125..17f5e8d235 100644 --- a/src/plugins/qmldesigner/designercore/designercore.pri +++ b/src/plugins/qmldesigner/designercore/designercore.pri @@ -7,7 +7,6 @@ QT += script \ DEFINES += TEST_EXPORTS INCLUDEPATH += $$PWD \ $$PWD/include -DEPENDPATH += $$PWD $$PWD/include SOURCES += $$PWD/model/abstractview.cpp \ $$PWD/instances/nodeinstanceview.cpp \ $$PWD/model/rewriterview.cpp \ diff --git a/src/plugins/qmljstools/qmljstools-lib.pri b/src/plugins/qmljstools/qmljstools-lib.pri index 14e1c763de..6c622dba07 100644 --- a/src/plugins/qmljstools/qmljstools-lib.pri +++ b/src/plugins/qmljstools/qmljstools-lib.pri @@ -2,7 +2,6 @@ DEFINES += QMLJSTOOLS_STATIC } -DEPENDPATH += $$PWD INCLUDEPATH += $$PWD/.. HEADERS += \ diff --git a/src/plugins/qmljstools/qmljstools.pri b/src/plugins/qmljstools/qmljstools.pri index 196d757a14..5b1a7b957c 100644 --- a/src/plugins/qmljstools/qmljstools.pri +++ b/src/plugins/qmljstools/qmljstools.pri @@ -1,6 +1,5 @@ include(qmljstools_dependencies.pri) -DEPENDPATH += $$PWD INCLUDEPATH += $$PWD/.. LIBS *= -l$$qtLibraryName(QmlJSTools) diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri index 2494093aeb..488f9c30fb 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri @@ -1,5 +1,4 @@ INCLUDEPATH *= $$PWD -DEPENDPATH *= $$PWD SOURCES += \ $$PWD/plugingenerator.cpp \ $$PWD/classlist.cpp \ diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index 7b42317bbb..51558f8ed2 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -7,9 +7,6 @@ include(texteditor_dependencies.pri) INCLUDEPATH += generichighlighter \ tooltip \ snippets -DEPENDPATH += generichighlighter \ - tooltip \ - snippets SOURCES += texteditorplugin.cpp \ textfilewizard.cpp \ plaintexteditor.cpp \ diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbase.pri b/src/plugins/valgrindtoolbase/valgrindtoolbase.pri index 22fc88f3e3..0ffb7c37dc 100644 --- a/src/plugins/valgrindtoolbase/valgrindtoolbase.pri +++ b/src/plugins/valgrindtoolbase/valgrindtoolbase.pri @@ -1,5 +1,4 @@ include(valgrindtoolbase_dependencies.pri) INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD LIBS *= -l$$qtLibraryName(ValgrindToolBase) diff --git a/src/private_headers.pri b/src/private_headers.pri index 60b4788e90..b00401a055 100644 --- a/src/private_headers.pri +++ b/src/private_headers.pri @@ -8,10 +8,4 @@ isEmpty(QT_PRIVATE_HEADERS) { $${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/src/tools/gen-cpp-ast/gen-cpp-ast.pro b/src/tools/gen-cpp-ast/gen-cpp-ast.pro index 1831a41369..e7fb63f3de 100644 --- a/src/tools/gen-cpp-ast/gen-cpp-ast.pro +++ b/src/tools/gen-cpp-ast/gen-cpp-ast.pro @@ -2,7 +2,6 @@ QT = core gui macx:CONFIG -= app_bundle TEMPLATE = app TARGET = generate-ast -DEPENDPATH += . INCLUDEPATH += . ../../libs include(../../libs/cplusplus/cplusplus-lib.pri) diff --git a/src/tools/mkvisitor/mkvisitor.pro b/src/tools/mkvisitor/mkvisitor.pro index 3f3f7dbc6b..03c53754d2 100644 --- a/src/tools/mkvisitor/mkvisitor.pro +++ b/src/tools/mkvisitor/mkvisitor.pro @@ -1,7 +1,6 @@ QT = core gui macx:CONFIG -= app_bundle TARGET = cplusplus0 -DEPENDPATH += . INCLUDEPATH += . ../../libs include(../../libs/cplusplus/cplusplus-lib.pri) diff --git a/src/tools/qpatch/bootstrap.pri b/src/tools/qpatch/bootstrap.pri index b3ee948487..a82caf5ff2 100644 --- a/src/tools/qpatch/bootstrap.pri +++ b/src/tools/qpatch/bootstrap.pri @@ -29,13 +29,6 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtXml \ $$QT_SOURCE_TREE/src/xml -DEPENDPATH += $$INCLUDEPATH \ - $$QT_SOURCE_TREE/src/corelib/global \ - $$QT_SOURCE_TREE/src/corelib/kernel \ - $$QT_SOURCE_TREE/src/corelib/tools \ - $$QT_SOURCE_TREE/src/corelib/io \ - $$QT_SOURCE_TREE/src/corelib/codecs \ - $$QT_SOURCE_TREE/src/xml hpux-acc*|hpuxi-acc* { LIBS += $$QT_BUILD_TREE/src/tools/bootstrap/libbootstrap.a diff --git a/src/tools/qtlibspatcher/qtlibspatcher.pro b/src/tools/qtlibspatcher/qtlibspatcher.pro index d5aef7fefb..9ef8d70434 100644 --- a/src/tools/qtlibspatcher/qtlibspatcher.pro +++ b/src/tools/qtlibspatcher/qtlibspatcher.pro @@ -2,7 +2,6 @@ CONFIG += console QT -= gui TEMPLATE = app TARGET = -DEPENDPATH += . INCLUDEPATH += . DESTDIR = . diff --git a/tests/auto/externaltool/externaltool.pro b/tests/auto/externaltool/externaltool.pro index 75544ec597..3fa493e7de 100644 --- a/tests/auto/externaltool/externaltool.pro +++ b/tests/auto/externaltool/externaltool.pro @@ -4,7 +4,6 @@ include(../../../src/plugins/coreplugin/coreplugin.pri) LIBS *= -L$$IDE_PLUGIN_PATH/Nokia INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins/coreplugin INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin -DEPENDPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin SOURCES += tst_externaltooltest.cpp \ $$IDE_SOURCE_TREE/src/plugins/coreplugin/externaltool.cpp diff --git a/tests/auto/qml/codemodel/basic/basic.pro b/tests/auto/qml/codemodel/basic/basic.pro index 90072f8c6d..32f35b0196 100644 --- a/tests/auto/qml/codemodel/basic/basic.pro +++ b/tests/auto/qml/codemodel/basic/basic.pro @@ -25,8 +25,6 @@ CONFIG += qtestlib testcase DEFINES+=QTCREATORDIR=\\\"$$IDE_SOURCE_TREE\\\" DEFINES+=QT_CREATOR QTCREATOR_TEST -DEPENDPATH += . - include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/plugins/qmljstools/qmljstools.pri) diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro index 886207cc69..521f671663 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro +++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro @@ -4,7 +4,6 @@ CONFIG += qtestlib testcase ##DEFINES += DONT_MESS_WITH_QDEBUG -DEPENDPATH += .. INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include TARGET = tst_bauhaus diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index c26f30f7f6..78445403c0 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -25,8 +25,6 @@ QT += script \ DEFINES+=QTCREATORDIR=\\\"$$IDE_BUILD_TREE\\\" DEFINES+=QT_CREATOR QTCREATOR_TEST -DEPENDPATH += .. -DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore |