Commit 70073268 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

clean up DEPENDPATH insanity

simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
parent 645b3c46
......@@ -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
......
INCLUDEPATH += $$PWD/include
DEPENDPATH += $$PWD $$PWD/include editor $$PWD/qt-private
include($$PWD/protocol/protocol.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)
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)
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
......@@ -4,7 +4,6 @@ contains(CONFIG, dll) {
DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB
}
DEPENDPATH += $$PWD
INCLUDEPATH += $$PWD/..
HEADERS += \
......
QT += declarative script
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
contains(CONFIG, dll) {
DEFINES += BUILD_QMLEDITORWIDGETS_LIB
......
INCLUDEPATH += $$PWD $$PWD/easingpane
DEPENDPATH += $$PWD $$PWD/easingpane
QT += declarative
LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
......
......@@ -6,7 +6,6 @@ contains(CONFIG, dll) {
include(parser/parser.pri)
DEPENDPATH += $$PWD
INCLUDEPATH += $$PWD/..
HEADERS += \
......
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
INCLUDEPATH *= $$PWD/../../shared/symbianutils
DEPENDPATH += $$PWD/../../shared/symbianutils
LIBS *= -l$$qtLibraryName(symbianutils)
include(analyzerbase_dependencies.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
LIBS *= -l$$qtLibraryName(AnalyzerBase)
......@@ -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
......@@ -16,10 +16,6 @@ INCLUDEPATH += dialogs \
editormanager \
progressmanager \
scriptmanager
DEPENDPATH += dialogs \
actionmanager \
editormanager \
scriptmanager
SOURCES += mainwindow.cpp \
editmode.cpp \
tabpositionindicator.cpp \
......
......@@ -13,4 +13,3 @@ SOURCES += $$PWD/cdbengine.cpp \
FORMS += cdb/cdboptionspagewidget.ui
INCLUDEPATH*=$$PWD
DEPENDPATH*=$$PWD
include(debugger_dependencies.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
LIBS *= -l$$qtLibraryName(Debugger)
INCLUDEPATH+=$$PWD
DEPENDPATH+=$$PWD
DEFINES+=CPP_ENABLED
......
QT += network
INCLUDEPATH+=$$PWD
DEPENDPATH+=$$PWD
HEADERS += $$PWD/gitoriousclonewizard.h \
$$PWD/gitorioushostwizardpage.h \
......
include(memcheck_dependencies.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
LIBS *= -l$$qtLibraryName(Memcheck)
DEPENDPATH += $$PWD/qtpropertybrowser/src/
\ No newline at end of file
......@@ -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 \
......
......@@ -2,7 +2,6 @@
DEFINES += QMLJSTOOLS_STATIC
}
DEPENDPATH += $$PWD
INCLUDEPATH += $$PWD/..
HEADERS += \
......
include(qmljstools_dependencies.pri)
DEPENDPATH += $$PWD
INCLUDEPATH += $$PWD/..
LIBS *= -l$$qtLibraryName(QmlJSTools)
INCLUDEPATH *= $$PWD
DEPENDPATH *= $$PWD
SOURCES += \
$$PWD/plugingenerator.cpp \
$$PWD/classlist.cpp \
......
......@@ -7,9 +7,6 @@ include(texteditor_dependencies.pri)
INCLUDEPATH += generichighlighter \
tooltip \
snippets
DEPENDPATH += generichighlighter \
tooltip \
snippets
SOURCES += texteditorplugin.cpp \
textfilewizard.cpp \
plaintexteditor.cpp \
......
include(valgrindtoolbase_dependencies.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
LIBS *= -l$$qtLibraryName(ValgrindToolBase)
......@@ -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
}
......@@ -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)
......
QT = core gui
macx:CONFIG -= app_bundle
TARGET = cplusplus0
DEPENDPATH += .
INCLUDEPATH += . ../../libs
include(../../libs/cplusplus/cplusplus-lib.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
......
......@@ -2,7 +2,6 @@ CONFIG += console
QT -= gui
TEMPLATE = app
TARGET =
DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = .
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment