diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2019-03-04 07:57:34 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2019-03-04 08:19:18 +0000 |
| commit | 23a9a04935c28110c2cff0d71873573d8f8f51c3 (patch) | |
| tree | 6f963618d88c0d1040c2beb0044e77d1304daa73 | |
| parent | 56a4a58c999e03385bad6ab052f87ffe2c63500f (diff) | |
| download | qtgraphicaleffects-23a9a04935c28110c2cff0d71873573d8f8f51c3.tar.gz | |
Android: Fix autotest
First of all, we need to include a dummy.qml which imports the
graphical effects, otherwise it will be ignored by qmlimportscanner,
since all the QML code is generated programmatically.
Second of all, using the Qml2ImportPath to look up the imports is
not sufficient on Android, where the QML2_IMPORT_PATH environment
variable is used instead. So we just add code to check this first,
based on the order of precedence actually used by Qt.
Task-number: QTBUG-73574
Change-Id: I7b140dcac758ff37340fd7539f5cacb2982ff7aa
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/dummy.qml | 6 | ||||
| -rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 711d2ac..df22767 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -6,3 +6,6 @@ QT += qml testlib quick TARGET = tst_qtgraphicaleffects SOURCES += tst_qtgraphicaleffects.cpp + +DISTFILES += \ + dummy.qml diff --git a/tests/auto/dummy.qml b/tests/auto/dummy.qml new file mode 100644 index 0000000..17ba150 --- /dev/null +++ b/tests/auto/dummy.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import QtGraphicalEffects 1.0 + +Item { + +} diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index 0f0e1df..7f26b01 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -89,8 +89,12 @@ void tst_qtgraphicaleffects::initTestCase() { QString import; + QString qmlImportPath = qgetenv("QML2_IMPORT_PATH"); + if (qmlImportPath.isEmpty() || !QFile::exists(qmlImportPath)) + qmlImportPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + // Allow the test to work whether or not the module is yet installed. - if (QFile::exists(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/QtGraphicalEffects")) { + if (QFile::exists(qmlImportPath + "/QtGraphicalEffects")) { // Module is installed - import it the nice way import = "QtGraphicalEffects"; } |