1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Description: import module directly because we use custom import path
Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: not-needed
Last-Update: 2016-07-12
--- a/tests/auto/tst_qtgraphicaleffects.cpp
+++ b/tests/auto/tst_qtgraphicaleffects.cpp
@@ -87,23 +87,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::Qml2ImportsPath) + "/QtGraphicalEffects")) {
- // Module is installed - import it the nice way
- import = "QtGraphicalEffects";
- }
- else {
- // Module is not installed - import it from the source tree, by URI
- QString qmldir = QFINDTESTDATA("../../src/effects/qmldir");
- QVERIFY2(QFile::exists(qmldir), qPrintable(qmldir));
-
- QUrl url = QUrl::fromLocalFile(QFileInfo(qmldir).canonicalPath());
- import = "\"" + url.toString() + "\"";
- }
-
- importSelf = QString("import %1 1.0\n").arg(import);
+ importSelf = QString("import QtGraphicalEffects 1.0\n");
}
|
