diff options
| author | Christian Stenger <christian.stenger@theqtcompany.com> | 2016-03-31 13:04:16 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-03-31 13:20:45 +0000 |
| commit | 4b652cdc1ac01390fb175889dee2e642f47aa360 (patch) | |
| tree | eb1882112d083dfb00779adf194e3284179e2bb4 /tests/auto | |
| parent | ba145f6090f481a41e7a476355c83039ed8ff521 (diff) | |
Tests: Fix scriptengine test
Change-Id: I288f366785c72da49087cb688f7f1247c2494c99
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/installer/scriptengine/scriptengine.pro | 2 | ||||
| -rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/installer/unicodeexecutable/unicodeexecutable.pro | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/installer/scriptengine/scriptengine.pro b/tests/auto/installer/scriptengine/scriptengine.pro index 71d8196a1..50aa859a3 100644 --- a/tests/auto/installer/scriptengine/scriptengine.pro +++ b/tests/auto/installer/scriptengine/scriptengine.pro @@ -4,5 +4,7 @@ QT += qml widgets SOURCES += tst_scriptengine.cpp +DEFINES += "BUILDDIR=\\\"$$OUT_PWD\\\"" + RESOURCES += \ scriptengine.qrc diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp index 249d42f56..e6dd5db45 100644 --- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp +++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp @@ -498,7 +498,7 @@ private slots: void testInstallerExecuteEncodings() { - QString unicodeExecutableName = QLatin1String("../unicodeexecutable/unicodeexecutable"); + QString unicodeExecutableName = QLatin1String(BUILDDIR "/../unicodeexecutable/unicodeexecutable"); #if defined(Q_OS_WIN) unicodeExecutableName += QLatin1String(".exe"); #endif diff --git a/tests/auto/installer/unicodeexecutable/unicodeexecutable.pro b/tests/auto/installer/unicodeexecutable/unicodeexecutable.pro index 2da7be243..742a8b168 100644 --- a/tests/auto/installer/unicodeexecutable/unicodeexecutable.pro +++ b/tests/auto/installer/unicodeexecutable/unicodeexecutable.pro @@ -3,6 +3,6 @@ SOURCES = main.c CONFIG -= qt app_bundle CONFIG += console -DESTDIR = ./ +win32: DESTDIR = $$OUT_PWD QT = |