diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:31 +0100 |
| commit | 3b67ec7abdb3056f259eb0aa819de9b5bbf8ec3a (patch) | |
| tree | 84345fc1b93e153313c367abc1e8eac1ced51631 /src/qmltest | |
| parent | ede9a8285858873e644083bbad9a71da26276dce (diff) | |
| parent | 3795904e3831722e222fa32a1e52aeb6b3e6ba87 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I6b2539bf17d3e9bc66d96b53c1bce95680113ed8
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 1e25656048..56180f2dc5 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -498,7 +498,7 @@ int quick_test_main_with_setup(int argc, char **argv, const char *name, const ch } #endif -#ifdef Q_OS_ANDROID +#if defined(Q_OS_ANDROID) || defined(Q_OS_WINRT) if (testPath.isEmpty()) testPath = QLatin1String(":/"); #endif |