From 599a58170d072b80ddfe8ce73075e4598b2451c1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 20:00:54 +0100 Subject: remove obsolete DEPENDPATH assignments qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Ie57cf05c369e21b5b9e099b6ce9be4f75da1508f Reviewed-by: Joerg Bornemann --- src/angle/src/libGLESv2/libGLESv2.pro | 1 - src/tools/bootstrap/bootstrap.pro | 10 ---------- src/tools/qdoc/qdoc.pro | 3 --- tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro | 1 - tests/baselineserver/shared/baselineprotocol.pri | 1 - .../kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro | 1 - .../cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro | 1 - tests/manual/highdpi/highdpi.pro | 1 - 8 files changed, 19 deletions(-) diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 1075591c4b..7f2c59355d 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -1,6 +1,5 @@ TEMPLATE = lib TARGET = $$qtLibraryTarget(libGLESv2) -DEPENDPATH += . shaders CONFIG += simd include(../common/common.pri) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index f2f041b704..41b0ee192b 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -41,16 +41,6 @@ load(qt_module) INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global -DEPENDPATH += $$INCLUDEPATH \ - ../../corelib/global \ - ../../corelib/kernel \ - ../../corelib/tools \ - ../../corelib/io \ - ../../corelib/codecs \ - ../../corelib/json \ - ../../xml/dom \ - ../../xml/sax - SOURCES += \ ../../corelib/codecs/qlatincodec.cpp \ ../../corelib/codecs/qtextcodec.cpp \ diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index b489668059..c0f3cd70d1 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -5,9 +5,6 @@ DEFINES += QDOC2_COMPAT INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser -DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ - $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser - # Increase the stack size on MSVC to 4M to avoid a stack overflow win32-msvc*:{ QMAKE_LFLAGS += /STACK:4194304 diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro index 371e12a0eb..298e41fc89 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qxmlsimplereader -DEPENDPATH += parser INCLUDEPATH += parser HEADERS += parser/parser.h diff --git a/tests/baselineserver/shared/baselineprotocol.pri b/tests/baselineserver/shared/baselineprotocol.pri index 62e38a6ab5..996f9d5a1f 100644 --- a/tests/baselineserver/shared/baselineprotocol.pri +++ b/tests/baselineserver/shared/baselineprotocol.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD QT *= network diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro index d43342cd50..16539c0198 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = qtimer_vs_qmetaobject -DEPENDPATH += . INCLUDEPATH += . CONFIG += release diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro index a7aa675d87..9546adea1c 100644 --- a/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro +++ b/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = qmaccocoaviewcontainer -DEPENDPATH += . INCLUDEPATH += . QT += widgets LIBS += -framework Cocoa diff --git a/tests/manual/highdpi/highdpi.pro b/tests/manual/highdpi/highdpi.pro index 635ba37a38..b827456f9b 100644 --- a/tests/manual/highdpi/highdpi.pro +++ b/tests/manual/highdpi/highdpi.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = highdpi -DEPENDPATH += . INCLUDEPATH += . QT += widgets -- cgit v1.2.3