aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDaniel d'Andrada <daniel.dandrada@luxoft.com>2018-04-24 11:35:58 +0200
committerBramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>2018-04-24 13:25:09 +0000
commitb82f7ee17874e107ca57b8345059b5d04ee58b7e (patch)
treeb8612caea4e296ea7f6c48dabc0e3ddacdc59f88 /tests
parent9a4019cc5306bce83d4248e8b6a024326a0b0d89 (diff)
Make tests also look for modules in the installation directory
Qt's CI like to run the tests separately, from a clean checkout, without building the rest of project and after having built and installed the project in a previous step. Task-number: QTAUTO-1033 Change-Id: Ie515e2ff6eee3f8bef11b5ae57d1e6298f66cb17 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qmltests/qmltests.pro11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/qmltests/qmltests.pro b/tests/qmltests/qmltests.pro
index 1b6ab2a8..ed2a4a44 100644
--- a/tests/qmltests/qmltests.pro
+++ b/tests/qmltests/qmltests.pro
@@ -2,9 +2,18 @@ TEMPLATE=app
TARGET=neptune-qmltestsrunner
SOURCES += testrunner.cpp
+include(../../config.pri)
+
CONFIG += qmltestcase
-IMPORTPATH = $$BUILD_DIR/imports/shared $$BUILD_DIR/imports/system $$SOURCE_DIR/sysui $$SOURCE_DIR/tests/dummyimports
+# TODO: Check what is the import precedence to ensure Qt looks for modules first in the
+# build dir and only after in the installation dir.
+IMPORTPATH = $$BUILD_DIR/imports/shared \
+ $$BUILD_DIR/imports/system \
+ $$SOURCE_DIR/sysui \
+ $$SOURCE_DIR/tests/dummyimports \
+ $$INSTALL_PREFIX/neptune3/imports/system \
+ $$INSTALL_PREFIX/neptune3/imports/shared
COMPONENT_NAMES = ApplicationWidget
COMPONENT_NAMES += WidgetGrid