summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-02-03 16:02:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-06 08:34:12 +0100
commit1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3 (patch)
tree7fe3c665d0be47038046232c71dc56c74f3fe53f
parenta65e88aa4eeccb3e6e3d1888d5e2e866487c851f (diff)
downloadqtgraphicaleffects-1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3.tar.gz
qtgraphicaleffects-1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3.tar.bz2
qtgraphicaleffects-1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3.zip
tst_qtgraphicaleffects: make the test work on devicesupstream/5.2.2
Make the test find the 'QtGraphicalEffects' import under Qml2ImportsPath (QML 2.x) instead of ImportsPath (QML 1.x) when the source code is not available. This seems to have worked so far because the source code is always available in the CI machines, but it fails on devices where is not. Change-Id: I475ccd5431d5e7c3adf239b1158d7bb67e0bc042 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
-rw-r--r--tests/auto/tst_qtgraphicaleffects.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp
index a7b7020..7f17ee7 100644
--- a/tests/auto/tst_qtgraphicaleffects.cpp
+++ b/tests/auto/tst_qtgraphicaleffects.cpp
@@ -102,7 +102,7 @@ void tst_qtgraphicaleffects::initTestCase()
QString import;
// Allow the test to work whether or not the module is yet installed.
- if (QFile::exists(QLibraryInfo::location(QLibraryInfo::ImportsPath) + "/QtGraphicalEffects")) {
+ if (QFile::exists(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/QtGraphicalEffects")) {
// Module is installed - import it the nice way
import = "QtGraphicalEffects";
}