remove obsolete DEPENDPATH assignments

qmake now adds CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.

Change-Id: I705c8e11b8787bb4f848f4aad19d860f88b04577
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index fb5b43e..6ebd9ee 100644 (file)
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -12,8 +12,6 @@ QT += widgets network help sql help
 !isEmpty(QT.printsupport.name): QT += printsupport
 PROJECTNAME = Assistant
 
-DEPENDPATH += ../shared
-
 include(../../shared/fontpanel/fontpanel.pri)
 
 QMAKE_DOCS = $$PWD/doc/qtassistant.qdocconf

diff --git a/src/macdeployqt/tests/deployment_mac.pro b/src/macdeployqt/tests/deployment_mac.pro
index ca19bee..59f6071 100644 (file)
--- a/src/macdeployqt/tests/deployment_mac.pro
+++ b/src/macdeployqt/tests/deployment_mac.pro
@@ -1,5 +1,4 @@
 TEMPLATE = app
-DEPENDPATH += . ../shared/
 INCLUDEPATH += . ../shared/
 TARGET=tst_deployment_mac
 CONFIG += qtestlib

diff --git a/src/qtconcurrent/codegenerator/codegenerator.pri b/src/qtconcurrent/codegenerator/codegenerator.pri
index 0aeabab..1ffe5bf 100644 (file)
--- a/src/qtconcurrent/codegenerator/codegenerator.pri
+++ b/src/qtconcurrent/codegenerator/codegenerator.pri
@@ -1,5 +1,4 @@
 SOURCES +=  $$PWD/src/codegenerator.cpp
 HEADERS +=  $$PWD/src/codegenerator.h
 INCLUDEPATH += $$PWD/src
-DEPENDPATH += $$PWD/src
 

diff --git a/src/shared/qtgradienteditor/qtcolorbutton.pri b/src/shared/qtgradienteditor/qtcolorbutton.pri
index 0e41068..b9550cb 100644 (file)
--- a/src/shared/qtgradienteditor/qtcolorbutton.pri
+++ b/src/shared/qtgradienteditor/qtcolorbutton.pri
@@ -1,4 +1,3 @@
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 SOURCES +=   $$PWD/qtcolorbutton.cpp
 HEADERS +=   $$PWD/qtcolorbutton.h

diff --git a/src/shared/qtgradienteditor/qtgradienteditor.pri b/src/shared/qtgradienteditor/qtgradienteditor.pri
index 4cf059e..6a2a968 100644 (file)
--- a/src/shared/qtgradienteditor/qtgradienteditor.pri
+++ b/src/shared/qtgradienteditor/qtgradienteditor.pri
@@ -1,5 +1,4 @@
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 FORMS +=     $$PWD/qtgradienteditor.ui \
              $$PWD/qtgradientdialog.ui \
              $$PWD/qtgradientview.ui \

diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.pri b/src/shared/qtpropertybrowser/qtpropertybrowser.pri
index 85c2b8d..8d767d6 100644 (file)
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.pri
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.pri
@@ -1,5 +1,4 @@
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 SOURCES += $$PWD/qtpropertybrowser.cpp \
             $$PWD/qtpropertymanager.cpp \
             $$PWD/qteditorfactory.cpp \

diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils.pri b/src/shared/qtpropertybrowser/qtpropertybrowserutils.pri
index 1755448..22f28a0 100644 (file)
--- a/src/shared/qtpropertybrowser/qtpropertybrowserutils.pri
+++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils.pri
@@ -1,4 +1,3 @@
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 SOURCES += $$PWD/qtpropertybrowserutils.cpp
 HEADERS += $$PWD/qtpropertybrowserutils_p.h

diff --git a/src/shared/qttoolbardialog/qttoolbardialog.pri b/src/shared/qttoolbardialog/qttoolbardialog.pri
index 5aca447..6e41252 100644 (file)
--- a/src/shared/qttoolbardialog/qttoolbardialog.pri
+++ b/src/shared/qttoolbardialog/qttoolbardialog.pri
@@ -1,5 +1,4 @@
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 SOURCES += $$PWD/qttoolbardialog.cpp
 HEADERS += $$PWD/qttoolbardialog.h
 FORMS += $$PWD/qttoolbardialog.ui

diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
index 65391d6..a3d1138 100644 (file)
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
@@ -23,7 +23,7 @@ SOURCES += wildcard/main*.cpp \
 VPATH = vpaths/dependpath
 
 # The purpose of this test is to test expansion of environment variables,
-# and to test if the DEPENDPATH variable is considered correctly.
+# and to test if the VPATH variable is considered correctly.
 if (exists($$member($$(PATH), 0))) {
     SOURCES += main_dependpath.cpp
 }