Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into merge

Change-Id: I5824a3eb624b325de10acfd5109c4c1bdabcf780

6 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro
index 017ef0769a..4069ad4c68 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  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 09ea35cd9e..6a136aeb7e 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -5084,7 +5084,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
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index d0f8c401d6..81d4fd3348 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -69,8 +69,7 @@ QUICKTESTS =  \
     qquickcanvasitem \
     qquickscreen \
     touchmouse \
-# disabled to allow file dialog changes to use urls internally (qtbase)
-#    dialogs \
+    dialogs \
 
 
 SUBDIRS += $$PUBLICTESTS