examples/quick/demos/photosurface/photosurface.qml

@@ -39,13 +39,14 @@
 ****************************************************************************/
 import QtQuick 2.0
 import QtQuick.Dialogs 1.0
+import QtQuick.Window 2.1
 import Qt.labs.folderlistmodel 1.0
 
-Rectangle {
+Window {
     id: root
+    visible: true
     width: 1024; height: 600
     color: "black"
-    visible: true
     property int highestZ: 0
     property real defaultSize: 200
 

src/imports/widgets/qquickqfiledialog.cpp

@@ -96,6 +96,7 @@ public:
     virtual void exec() { m_dialog.exec(); }
 
     virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) {
+        m_dialog.winId();
         m_dialog.windowHandle()->setTransientParent(parent);
         m_dialog.windowHandle()->setFlags(f);
         m_dialog.setWindowModality(m);

tests/auto/quick/examples/tst_examples.cpp

@@ -89,6 +89,7 @@ tst_examples::tst_examples()
     // Add files to exclude here
     excludedFiles << "examples/quick/canvas/tiger/tiger.qml"; // QTBUG-26528
     excludedFiles << "snippets/qml/listmodel/listmodel.qml"; //Just a ListModel, no root QQuickItem
+    excludedFiles << "examples/quick/demos/photosurface/photosurface.qml"; // root item is Window rather than Item
 
     // Add directories you want excluded here (don't add examples/, because they install to examples/qtdeclarative/)
     excludedDirs << "shared"; //Not an example

tests/auto/quick/touchmouse/touchmouse.pro

@@ -13,8 +13,6 @@ TESTDATA = data/*
 
 # OTHER_FILES += data/foo.qml
 
-CONFIG += parallel_test
-
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
 mac:CONFIG+=insignificant_test # QTBUG-27890