diff options
| -rw-r--r-- | src/lib/use.pri | 8 | ||||
| -rw-r--r-- | src/plugins/scanner/cpp/cpp.pro | 3 | ||||
| -rw-r--r-- | src/plugins/scanner/qt/qt.pro | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/blackbox.pro | 5 | ||||
| -rw-r--r-- | tests/auto/buildgraph/buildgraph.pro | 5 | ||||
| -rw-r--r-- | tests/auto/language/language.pro | 5 | ||||
| -rw-r--r-- | tests/auto/tools/tools.pro | 5 |
7 files changed, 11 insertions, 23 deletions
diff --git a/src/lib/use.pri b/src/lib/use.pri index a578f4a83..843bf9e2e 100644 --- a/src/lib/use.pri +++ b/src/lib/use.pri @@ -32,12 +32,6 @@ INCLUDEPATH += \ $$PWD \ $$PWD/.. -DEPENDPATH += \ - $$PWD/buildgraph\ - $$PWD/Qbs\ - $$PWD/l2\ - $$PWD/parser\ - $$PWD/tools\ - $$INCLUDEPATH +CONFIG += depend_includepath DEFINES += QT_CREATOR QML_BUILD_STATIC_LIB # needed for QmlJS diff --git a/src/plugins/scanner/cpp/cpp.pro b/src/plugins/scanner/cpp/cpp.pro index e5d4d8381..c8a7f080a 100644 --- a/src/plugins/scanner/cpp/cpp.pro +++ b/src/plugins/scanner/cpp/cpp.pro @@ -3,11 +3,10 @@ DEFINES += CPLUSPLUS_NO_PARSER DESTDIR= ../../../../plugins/ TEMPLATE = lib TARGET = qbs_cpp_scanner -DEPENDPATH += . -INCLUDEPATH += . QT = core +CONFIG += depend_includepath unix: CONFIG += plugin HEADERS += CPlusPlusForwardDeclarations.h Lexer.h Token.h ../scanner.h \ diff --git a/src/plugins/scanner/qt/qt.pro b/src/plugins/scanner/qt/qt.pro index c825e9d15..286fd0a83 100644 --- a/src/plugins/scanner/qt/qt.pro +++ b/src/plugins/scanner/qt/qt.pro @@ -1,11 +1,10 @@ DESTDIR= ../../../../plugins TEMPLATE = lib TARGET = qbs_qt_scanner -DEPENDPATH += . -INCLUDEPATH += . Qt = core xml +CONFIG += depend_includepath unix: CONFIG += plugin HEADERS += ../scanner.h diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro index 78f212385..3ce0402b3 100644 --- a/tests/auto/blackbox/blackbox.pro +++ b/tests/auto/blackbox/blackbox.pro @@ -1,12 +1,11 @@ TEMPLATE = app TARGET = tst_blackbox DESTDIR = ./ -DEPENDPATH += . -INCLUDEPATH += . ../../../src/lib/ +INCLUDEPATH += ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" QT = core script testlib -CONFIG += testcase +CONFIG += depend_includepath testcase include(../../../src/lib/use.pri) diff --git a/tests/auto/buildgraph/buildgraph.pro b/tests/auto/buildgraph/buildgraph.pro index 173cbbae5..31255e088 100644 --- a/tests/auto/buildgraph/buildgraph.pro +++ b/tests/auto/buildgraph/buildgraph.pro @@ -1,12 +1,11 @@ TEMPLATE = app TARGET = tst_buildgraph DESTDIR = ./ -DEPENDPATH += . -INCLUDEPATH += . ../../../src/lib/ +INCLUDEPATH += ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" QT = core testlib -CONFIG += testcase +CONFIG += depend_includepath testcase include(../../../src/lib/use.pri) diff --git a/tests/auto/language/language.pro b/tests/auto/language/language.pro index 982bbb30d..12295ef45 100644 --- a/tests/auto/language/language.pro +++ b/tests/auto/language/language.pro @@ -1,12 +1,11 @@ TEMPLATE = app TARGET = tst_language DESTDIR = ./ -DEPENDPATH += . -INCLUDEPATH += . ../../../src/lib/ +INCLUDEPATH += ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" QT = core testlib -CONFIG += testcase +CONFIG += depend_includepath testcase include(../../../src/lib/use.pri) diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro index 460b6ef34..4a96630f5 100644 --- a/tests/auto/tools/tools.pro +++ b/tests/auto/tools/tools.pro @@ -1,12 +1,11 @@ TEMPLATE = app TARGET = tst_tools DESTDIR = ./ -DEPENDPATH += . -INCLUDEPATH += . ../../../src/lib/ +INCLUDEPATH += ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" QT = core testlib -CONFIG += testcase +CONFIG += depend_includepath testcase include(../../../src/lib/use.pri) include(../../../qbs_version.pri) |