Merge "Merge branch 'stable' into dev" into refs/staging/dev

diff --cc src/qml/qml/qqmlengine.cpp
Simple merge

diff --cc src/qml/qml/qqmltypeloader.cpp
Simple merge

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

diff --cc src/quick/scenegraph/qsgthreadedrenderloop.cpp
Simple merge

diff --cc tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
Simple merge

diff --cc tests/auto/quick/qquickgridview/qquickgridview.pro
index 1efa6c4,0e67938..3a41552
--- 1/tests/auto/quick/qquickgridview/qquickgridview.pro
--- 2/tests/auto/quick/qquickgridview/qquickgridview.pro
+++ b/tests/auto/quick/qquickgridview/qquickgridview.pro
@@@ -10,7 -10,5 +10,5 @@@ 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
  DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
- 
- mac:CONFIG+=insignificant_test # QTBUG-27890

diff --cc tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
Simple merge

diff --cc tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
Simple merge

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