From fe9f415cf27bc5ea003d14bf7c7ca0484acce3f2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 21 May 2012 12:16:44 +0200 Subject: [PATCH] don't reference $$QT_SOURCE/BUILD_TREE - they're unavailable here Change-Id: I31bed7091294dea96ab06f05aa90267757d23c82 Reviewed-by: Joerg Bornemann Reviewed-by: Jason McDonald Reviewed-by: Rohan McGovern --- tests/auto/checkxmlfiles/checkxmlfiles.pro | 10 +++++----- tests/auto/patternistexamples/patternistexamples.pro | 12 ++++++------ tests/auto/xmlpatterns.pri | 2 +- tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro | 8 +++----- tests/auto/xmlpatternsview/view/view.pro | 4 ++-- tests/auto/xmlpatternsview/xmlpatternsview.pro | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index 62a72dd..e4b11e1 100644 --- a/tests/auto/checkxmlfiles/checkxmlfiles.pro +++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro @@ -9,11 +9,11 @@ include (../xmlpatterns.pri) wince*: { QT += network addFiles.files = \ - $$QT_SOURCE_TREE/examples/sql/masterdetail/albumdetails.xml \ - $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/globalVariables/globals.gccxml \ - $$QT_SOURCE_TREE/doc/src/diagrams/stylesheet/treeview.svg \ - $$QT_SOURCE_TREE/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui \ - $$QT_SOURCE_TREE/examples/tools/undo/undo.qrc + $$QT.sql.sources/../../examples/sql/masterdetail/albumdetails.xml \ + ../../../examples/xquery/globalVariables/globals.gccxml \ + ../../../../qtdoc/doc/src/diagrams/stylesheet/treeview.svg \ + ../../../../qtdoc/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui \ + $$QT.widgets.sources/../../examples/tools/undo/undo.qrc addFiles.path = xmlfiles DEPLOYMENT += addFiles } else { diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro index 97c792a..e2fa151 100644 --- a/tests/auto/patternistexamples/patternistexamples.pro +++ b/tests/auto/patternistexamples/patternistexamples.pro @@ -3,17 +3,17 @@ CONFIG += testcase SOURCES += tst_patternistexamples.cpp QT += testlib wince*: { - snippets.files = $$QT_SOURCE_TREE/doc/src/snippets/patternist/* + snippets.files = ../../../doc/src/snippets/patternist/* snippets.path = patternist - widgetRen.files = $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/widgetRenderer/* + widgetRen.files = ../../../examples/xquery/widgetRenderer/* widgetRen.path = widgetRenderer - globVar.files = $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/globalVariables/* + globVar.files = ../../../examples/xquery/globalVariables/* globVar.path = globalVariables - filetree.files = $$QT_SOURCE_TREE/examples/xmlpatterns/filetree/* + filetree.files = ../../../examples/filetree/* filetree.path = filetree - recipes.files = $$QT_SOURCE_TREE/examples/xmlpatterns/recipes/* + recipes.files = ../../../examples/recipes/* recipes.path = recipes - files.files = $$QT_SOURCE_TREE/examples/xmlpatterns/recipes/files/* + files.files = ../../../examples/recipes/files/* files.path = recipes\\files DEPLOYMENT += snippets widgetRen globVar filetree recipes files diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri index 320d6cb..ea939f1 100644 --- a/tests/auto/xmlpatterns.pri +++ b/tests/auto/xmlpatterns.pri @@ -1,7 +1,7 @@ QT += core-private xmlpatterns xmlpatterns-private wince*: { - patternsdk.files = $$QT_BUILD_TREE/lib/QtXmlPatternsSDK*.dll + patternsdk.files = $$QT.xmlpatterns.libs/QtXmlPatternsSDK*.dll patternsdk.path = . basedata.files = xmlpaternsxqts/Baseline.xml basedata.path = . diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index bc5ecd7..c4173e6 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -18,8 +18,6 @@ LIBS += -L$$QT.xmlpatterns.libs -l$$PATTERNIST_SDK QT += xml testlib -INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternssdk/ \ - $$QT_BUILD_TREE/include/QtXmlPatterns/private \ - $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts \ - ../xmlpatternsxqts \ - ../xmlpatternssdk +INCLUDEPATH += \ + ../xmlpatternsxqts \ + ../xmlpatternssdk diff --git a/tests/auto/xmlpatternsview/view/view.pro b/tests/auto/xmlpatternsview/view/view.pro index f9d36ee..31ca97c 100644 --- a/tests/auto/xmlpatternsview/view/view.pro +++ b/tests/auto/xmlpatternsview/view/view.pro @@ -1,6 +1,6 @@ TARGET = xmlpatternsview TEMPLATE = app -DESTDIR = $$QT_BUILD_TREE/bin +DESTDIR = $$QT.xmlpatterns.bins include (../../xmlpatterns.pri) @@ -32,4 +32,4 @@ FORMS = ui_BaseLinePage.ui \ ui_TestResultView.ui \ ui_FunctionSignaturesView.ui -INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts/lib/ $$QT_BUILD_TREE/include/QtXmlPatterns/private +INCLUDEPATH += ../../xmlpatternsxqts/lib diff --git a/tests/auto/xmlpatternsview/xmlpatternsview.pro b/tests/auto/xmlpatternsview/xmlpatternsview.pro index 875d221..2fd12ab 100644 --- a/tests/auto/xmlpatternsview/xmlpatternsview.pro +++ b/tests/auto/xmlpatternsview/xmlpatternsview.pro @@ -7,7 +7,7 @@ include (../xmlpatterns.pri) TARGET = tst_xmlpatternsview wince*: { - viewexe.files = $$QT_BUILD_TREE/xmlpatternsview.exe + viewexe.files = $$QT.xmlpatterns.bins/xmlpatternsview.exe viewexe.path = . DEPLOYMENT += viewexe } -- 2.7.4