diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-09 22:00:08 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-09 22:24:13 +0100 |
commit | 700732683779a862091b19336ef980801e412395 (patch) | |
tree | 71541868b365cd4364130636853cb9d33910ca47 /src/plugins | |
parent | 645b3c46edd15940bfb49b18afd5be99462cb5e2 (diff) | |
download | qt-creator-700732683779a862091b19336ef980801e412395.tar.gz |
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.
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/analyzerbase/analyzerbase.pri | 1 | ||||
-rw-r--r-- | src/plugins/coreplugin/coreplugin.pri | 1 | ||||
-rw-r--r-- | src/plugins/coreplugin/coreplugin.pro | 4 | ||||
-rw-r--r-- | src/plugins/debugger/cdb/cdb.pri | 1 | ||||
-rw-r--r-- | src/plugins/debugger/debugger.pri | 1 | ||||
-rw-r--r-- | src/plugins/designer/cpp/cpp.pri | 1 | ||||
-rw-r--r-- | src/plugins/git/gitorious/gitorious.pri | 1 | ||||
-rw-r--r-- | src/plugins/memcheck/memcheck.pri | 1 | ||||
-rw-r--r-- | src/plugins/qmldesigner/designercore/depend_paths.pri | 1 | ||||
-rw-r--r-- | src/plugins/qmldesigner/designercore/designercore.pri | 1 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljstools-lib.pri | 1 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljstools.pri | 1 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri | 1 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.pro | 3 | ||||
-rw-r--r-- | src/plugins/valgrindtoolbase/valgrindtoolbase.pri | 1 |
15 files changed, 0 insertions, 20 deletions
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) |