Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	tests/auto/quick/qquickgridview/qquickgridview.pro
	tests/auto/quick/qquickitem/qquickitem.pro

Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556

diff --cc examples/quick/dialogs/systemdialogs/FileDialogs.qml
Simple merge

diff --cc src/quick/items/context2d/qquickcanvasitem.cpp
Simple merge

diff --cc src/quick/items/qquickflickable.cpp
Simple merge

diff --cc src/quick/items/qquickitem.cpp
Simple merge

diff --cc src/quick/items/qquickwindow.cpp
Simple merge

diff --cc tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
Simple merge

diff --cc tests/auto/quick/qquickgridview/qquickgridview.pro
index 3a41552,ab3de5b..40b43fa
--- 1/tests/auto/quick/qquickgridview/qquickgridview.pro
--- 2/tests/auto/quick/qquickgridview/qquickgridview.pro
+++ b/tests/auto/quick/qquickgridview/qquickgridview.pro
@@@ -10,5 -10,8 +10,9 @@@ include (../shared/util.pri
  
  TESTDATA = data/*
  
 -QT += core-private gui-private v8-private qml-private quick-private testlib
 +QT += core-private gui-private  qml-private quick-private testlib
++
+ win32:CONFIG += insignificant_test # QTBUG-33017
+ macx:CONFIG += insignificant_test # QTBUG-33017
+ 
  DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --cc tests/auto/quick/qquickitem/qquickitem.pro
index 81e2e3a,5641ca5..9bcba5d
--- 1/tests/auto/quick/qquickitem/qquickitem.pro
--- 2/tests/auto/quick/qquickitem/qquickitem.pro
+++ b/tests/auto/quick/qquickitem/qquickitem.pro
@@@ -8,5 -8,7 +8,8 @@@ macx:CONFIG -= app_bundl
  
  TESTDATA = data/*
  
 -QT += core-private gui-private v8-private qml-private quick-private testlib
 +QT += core-private gui-private  qml-private quick-private testlib
++
+ win32:CONFIG += insignificant_test # QTBUG-32664
+ 
  DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --cc tests/auto/quick/qquicktextedit/qquicktextedit.pro
Simple merge