diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-05 03:02:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-05 03:02:10 +0100 |
| commit | 6ffa20bc5fb4ee1c556ab09a15e6e2be3b011fb9 (patch) | |
| tree | fac9442571dd29903aa70eb3d29771fcf74c0132 | |
| parent | 0fc226b32789adee140951c63739da65a081d211 (diff) | |
| parent | 23a9a04935c28110c2cff0d71873573d8f8f51c3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
Change-Id: I22dc781c5a97a5918318109e7047f80d9ab2e075
| -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"; } |