diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-24 10:09:17 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-24 10:09:17 +0200 |
commit | 84871192077c18bb093c6259339200bd22d64f00 (patch) | |
tree | 976e0579880d475f6bada6cda41d612db4733a60 /tests/auto/quick | |
parent | 117da3c1e6f14494693a2ffd96b415ffacc1a05c (diff) | |
parent | c3c943545eb7f084da314486524e8c9bb2fab431 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/quick')
-rw-r--r-- | tests/auto/quick/dialogs/dialogs.pro | 1 | ||||
-rw-r--r-- | tests/auto/quick/qquickanchors/data/loop2.qml | 4 | ||||
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquickview/tst_qquickview.cpp | 6 |
5 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro index 024b15a758..e3b1caa689 100644 --- a/tests/auto/quick/dialogs/dialogs.pro +++ b/tests/auto/quick/dialogs/dialogs.pro @@ -7,6 +7,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle macx:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable linux-*:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable +win32:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable CONFIG += parallel_test QT += core-private gui-private qml-private quick-private v8-private testlib diff --git a/tests/auto/quick/qquickanchors/data/loop2.qml b/tests/auto/quick/qquickanchors/data/loop2.qml index 044152989e..ba6f07f680 100644 --- a/tests/auto/quick/qquickanchors/data/loop2.qml +++ b/tests/auto/quick/qquickanchors/data/loop2.qml @@ -7,13 +7,13 @@ Rectangle { Image { id: image1 - source: "http://labs.qt.nokia.com/blogs/wp-content/uploads/2009/03/3311388091_ac2a257feb.jpg" + source: "http://blog.qt.digia.com/wp-content/uploads/2013/07/Qt-team-Oslo1.jpeg" anchors.right: image2.left } Image { id: image2 - source: "http://labs.qt.nokia.com/blogs/wp-content/uploads/2009/03/oslo_groupphoto.jpg" + source: "http://blog.qt.digia.com/wp-content/uploads/2013/07/Qt-team-Oslo1.jpeg" anchors.left: image1.right anchors.leftMargin: 20 } diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index fdaa1d6617..32099ae187 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1914,7 +1914,7 @@ void tst_qquicktext::linkInteraction() void tst_qquicktext::baseUrl() { QUrl localUrl("file:///tests/text.qml"); - QUrl remoteUrl("http://qt.nokia.com/test.qml"); + QUrl remoteUrl("http://www.qt-project.org/test.qml"); QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\n Text {}", localUrl); diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 798db9fe23..c14f191cb1 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -5083,7 +5083,7 @@ void tst_qquicktextedit::undo_keypressevents() void tst_qquicktextedit::baseUrl() { QUrl localUrl("file:///tests/text.qml"); - QUrl remoteUrl("http://qt.nokia.com/test.qml"); + QUrl remoteUrl("http://www.qt-project.org/test.qml"); QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\n TextEdit {}", localUrl); diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp index e2e20a6516..a4ed1267ac 100644 --- a/tests/auto/quick/qquickview/tst_qquickview.cpp +++ b/tests/auto/quick/qquickview/tst_qquickview.cpp @@ -80,7 +80,7 @@ void tst_QQuickView::resizemodeitem() QVERIFY(item); window.show(); - view->show(); + view->showNormal(); // initial size from root object QCOMPARE(item->width(), 200.0); @@ -126,7 +126,7 @@ void tst_QQuickView::resizemodeitem() QVERIFY(item); window.show(); - view->show(); + view->showNormal(); // initial size for root object QCOMPARE(item->width(), 200.0); @@ -173,7 +173,7 @@ void tst_QQuickView::resizemodeitem() QVERIFY(item); window.show(); - view->show(); + view->showNormal(); QTest::qWait(50); // initial size from root object |