diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-20 03:01:39 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-20 03:01:39 +0200 |
| commit | 12abb76bd76c51e4078d7b13ee42232d6fdd65f6 (patch) | |
| tree | 651eeac7d33f45b00e07be572d215154d2c2fc63 /tests | |
| parent | 1323d465b4698296533cf6c73ea5ace65dd0ce94 (diff) | |
| parent | 9bba89da77b73f016f22bc5d3f195d9c0212c7bc (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I58544f3833ea4a0d08408795dfd4f146db70377d
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/scion/scion.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro index 6e1f7f4..1ebc624 100644 --- a/tests/auto/scion/scion.pro +++ b/tests/auto/scion/scion.pro @@ -89,15 +89,15 @@ for (f,ALLSCXMLS) { ALLFILES = $$files($$SCXMLS_DIR/*.*, true) for (f,ALLFILES) { base = $$relative_path($$f,$$absolute_path($$SCXMLS_DIR)) - file = $$relative_path($$f, $$absolute_path($$PWD)) + file = $$relative_path($$f, $$absolute_path($$OUT_PWD)) qrc += '<file alias="$$base">$$file</file>' } contents = $$inc_list "std::function<QScxmlStateMachine *()> creators[] = {" $$func_list "};" -write_file("scxml/compiled_tests.h", contents)|error("Aborting.") +write_file("$$OUT_PWD/scxml/compiled_tests.h", contents)|error("Aborting.") contents = "const char *testBases[] = {" $$testBases "};" -write_file("scxml/scion.h", contents)|error("Aborting.") +write_file("$$OUT_PWD/scxml/scion.h", contents)|error("Aborting.") contents = '<!DOCTYPE RCC><RCC version=\"1.0\">' '<qresource>' $$qrc '</qresource></RCC>' -write_file("scion.qrc", contents)|error("Aborting.") +write_file("$$OUT_PWD/scion.qrc", contents)|error("Aborting.") |