diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-19 11:43:06 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-20 18:57:54 +0100 |
commit | 57c2475ddc6c78633f0c14b2b154a5afbca7d633 (patch) | |
tree | 9a3f3b72ddeef24390f3ef3d22cc14a57139d724 /tests | |
parent | 56d937d7578dc809ac5f9f2704f1d4598e640b7e (diff) | |
download | qttools-57c2475ddc6c78633f0c14b2b154a5afbca7d633.tar.gz |
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>
Diffstat (limited to 'tests')
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro index b6d226666..65391d6a7 100644 --- 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 556ca073d..9b48d7841 100644 --- 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 b96024596..c628879b3 100644 --- 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"); } |