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

 Conflicts:
	src/corelib/animation/qpropertyanimation.cpp
	src/gui/image/qicon.cpp
	tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp

Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21

1 files changed, 2 insertions, 12 deletions

diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 7c98b29348..7644e28b44 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -132,22 +132,12 @@ DECLARE_DEBUG_VAR(statistics)
     setWindowProperty function of the native interface to set the \e qnxWindowGroup property
     to the desired value, for example:
 
-    \code
-    QQuickView *view = new QQuickView(parent);
-    view->create();
-    QGuiApplication::platformNativeInterface()->setWindowProperty(view->handle(), "qnxWindowGroup",
-                                                                  group);
-    \endcode
+    \snippet code/src_plugins_platforms_qnx_qqnxwindow.cpp 0
 
     To leave the current window group, one passes a null value for the property value,
     for example:
 
-    \code
-    QQuickView *view = new QQuickView(parent);
-    view->create();
-    QGuiApplication::platformNativeInterface()->setWindowProperty(view->handle(), "qnxWindowGroup",
-                                                                  QVariant());
-    \endcode
+    \snippet code/src_plugins_platforms_qnx_qqnxwindow.cpp 1
 
     \section1 Window Id