Merge branch 'release' into stable

Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8

diff --cc src/qml/doc/qtqml.qdocconf
Simple merge

diff --cc src/qml/qml/qqmltimer_p.h
Simple merge

diff --cc src/qmltest/quicktest.cpp
Simple merge

diff --cc src/quick/items/qquicktextedit_p.h
Simple merge

diff --cc src/quick/items/qquicktextinput_p.h
Simple merge

diff --cc src/quick/util/qquickbehavior_p.h
Simple merge

diff --cc src/quick/util/qquickpropertychanges_p.h
Simple merge

diff --cc src/quick/util/qquickstategroup_p.h
Simple merge

diff --cc src/quick/util/qquicktransition_p.h
Simple merge

diff --cc tests/auto/quick/quick.pro
index 9600d0c,537a46f..3ed6ca8
--- 1/tests/auto/quick/quick.pro
--- 2/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@@ -5,12 -5,12 +5,12 @@@ PUBLICTESTS += 
      rendernode \
      qquickpixmapcache
  
 -!contains(QT_CONFIG, no-widgets): PUBLICTESTS += nodes
 +qtHaveModule(widgets): PUBLICTESTS += nodes
  
- !cross_compile: PUBLICTESTS += examples
+ !cross_compile: PRIVATETESTS += examples
  
  # This test requires the qtconcurrent module
 -!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qquickpixmapcache
 +!qtHaveModule(concurrent): PUBLICTESTS -= qquickpixmapcache
  
  PRIVATETESTS += \
      qquickanimations \