aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-11-15 17:21:26 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2012-11-16 10:21:36 +0100
commitcc02a56c59639f0c0ab40f9d95b597eb913729d5 (patch)
treea495095b4f93dbea93a766c5de1e5eda4b71a8d5 /src
parent16665154b5372034bb432ca0873b865e4c94e5b8 (diff)
cleanup .pro files
Do not use DEPENDPATH but CONFIG+=depend_includepath. Do not add "." to INCLUDEPATH. Change-Id: I3532833aef13d32f8278074283fcd12256d38143 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/use.pri8
-rw-r--r--src/plugins/scanner/cpp/cpp.pro3
-rw-r--r--src/plugins/scanner/qt/qt.pro3
3 files changed, 3 insertions, 11 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