don't add DEPENDSPATH to VPATH

follow suit with qmake ...

Change-Id: Ie1748d2056c7218b76d75cddd0bc7fb3f66cf8f7
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index 8ce881f..afc0d48 100644 (file)
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -287,7 +287,6 @@ static QStringList getSources(const ProFileEvaluator &visitor, const QString &pr
     QStringList baseVPaths;
     baseVPaths += visitor.absolutePathValues(QLatin1String("VPATH"), projectDir);
     baseVPaths << projectDir; // QMAKE_ABSOLUTE_SOURCE_PATH
-    baseVPaths += visitor.absolutePathValues(QLatin1String("DEPENDPATH"), projectDir);
     baseVPaths.removeDuplicates();
 
     QStringList sourceFiles;

diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
index b6d2266..65391d6 100644 (file)
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
@@ -20,7 +20,7 @@ SOURCES += wildcard/main*.cpp \
             wildcard*.cpp
 
 
-DEPENDPATH = vpaths/dependpath
+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.

diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result
index 556ca07..9b48d78 100644 (file)
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result
@@ -56,8 +56,8 @@
     <name>QCoreApplication</name>
     <message>
         <location filename="vpaths/dependpath/main_dependpath.cpp" line="48"/>
-        <source>Hello from a DEPENDPATH</source>
-        <comment>See if the DEPENDPATH thing works</comment>
+        <source>Hello from a VPATH</source>
+        <comment>See if the VPATH thing works</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
index b960245..c628879 100644 (file)
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/vpaths/dependpath/main_dependpath.cpp
@@ -45,7 +45,7 @@
 
 int main(int argc, char **argv)
 {
-    QCoreApplication::tr("Hello from a DEPENDPATH", "See if the DEPENDPATH thing works");
+    QCoreApplication::tr("Hello from a VPATH", "See if the VPATH thing works");
 }