aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-11 16:11:18 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-12 06:49:49 +0000
commita16f2cc391c0be5614641e629267bcbf4d200951 (patch)
tree669cc8b89f1749a842ec90a4bcc225a091b2267d
parent105f5dc352dd866844fad80a510105e5e7a70e9b (diff)
test: fix tst_QQuickGraphicsInfo::testProperties()
This also reverts commit 26051fd5724e56e0715bc56fde8e8464ff386bbc. Task-number: QTBUG-58039 Change-Id: I0b9146a64f1a112f5c059b2e29e874631c81d12c Reviewed-by: David Faure <david.faure@kdab.com>
-rw-r--r--tests/auto/quick/qquickgraphicsinfo/BLACKLIST3
-rw-r--r--tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickgraphicsinfo/BLACKLIST b/tests/auto/quick/qquickgraphicsinfo/BLACKLIST
deleted file mode 100644
index 4cefc165f0..0000000000
--- a/tests/auto/quick/qquickgraphicsinfo/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-[tst_QQuickGraphicsInfo::testProperties]
-opensuse-42.1
-ubuntu-14.04
diff --git a/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp b/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp
index 650892d650..4da6da6043 100644
--- a/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp
+++ b/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp
@@ -51,7 +51,7 @@ private slots:
void tst_QQuickGraphicsInfo::testProperties()
{
QQuickView view;
- view.setSource(QUrl::fromLocalFile("data/basic.qml"));
+ view.setSource(QUrl("data/basic.qml"));
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));