aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2018-04-25 15:07:36 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2018-04-26 07:08:11 +0000
commit08ae1d129e5d73e4c0e98a9146d14946deead623 (patch)
tree28ae3a674b19292b24a7b4f88f0e7dbb45e089f1 /tests
parentc54de8a19cbea93bc5335be6f6145dafa4319774 (diff)
Fix the qmltest environment when running the autotest
'make check' uses a target_wrapper.bat which defines the environment. This needst to be modified to also contain the PATH to the neptune3 installation folder as we need to load the libRemoteSettings.dll from there Task-number: QTAUTO-1041 Change-Id: I926b665b7389f6d9904d6f5501b7c58dc58e9f0c Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/qmltests/qmltests.pro10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/qmltests/qmltests.pro b/tests/qmltests/qmltests.pro
index ed2a4a44..8eb8d5d5 100644
--- a/tests/qmltests/qmltests.pro
+++ b/tests/qmltests/qmltests.pro
@@ -4,6 +4,16 @@ SOURCES += testrunner.cpp
include(../../config.pri)
+# This will add the install directory to the PATH variable of the target_wrapper.bat for the autotest
+# This is needed as the libRemoteSettings.dll will be installed there
+win32 {
+ extra_path.name = PATH
+ extra_path.CONFIG = prepend
+ extra_path.value += $$clean_path($$BUILD_DIR)
+ extra_path.value += $$clean_path($$INSTALL_PREFIX/neptune3)
+ QT_TOOL_ENV += extra_path
+}
+
CONFIG += qmltestcase
# TODO: Check what is the import precedence to ensure Qt looks for modules first in the