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

Conflicts:
	src/plugins/platforms/minimal/qminimalintegration.cpp
	src/plugins/platforms/offscreen/qoffscreenintegration.cpp

Change-Id: Ica85deeab5c5038ac004718e25194b1157343480

1 files changed, 5 insertions, 64 deletions

diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
index f30f88ccb7..b79a30f37b 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
@@ -107,79 +107,20 @@ void updateAllWidgets()
 
 
 //! [6]
-int main(int argc, char *argv[])
-{
-    QApplication::setDesktopSettingsAware(false);
-    QApplication app(argc, argv);
-    ...
-    return app.exec();
-}
-//! [6]
-
-
-//! [7]
 if ((startPos - currentPos).manhattanLength() >=
         QApplication::startDragDistance())
     startTheDrag();
-//! [7]
-
-
-//! [8]
-void MyApplication::commitData(QSessionManager& manager)
-{
-    if (manager.allowsInteraction()) {
-        int ret = QMessageBox::warning(
-                    mainWindow,
-                    tr("My Application"),
-                    tr("Save changes to document?"),
-                    QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-
-        switch (ret) {
-        case QMessageBox::Save:
-            manager.release();
-            if (!saveDocument())
-                manager.cancel();
-            break;
-        case QMessageBox::Discard:
-            break;
-        case QMessageBox::Cancel:
-        default:
-            manager.cancel();
-        }
-    } else {
-        // we did not get permission to interact, then
-        // do something reasonable instead
-    }
-}
-//! [8]
-
-
-//! [9]
-appname -session id
-//! [9]
-
-
-//! [10]
-foreach (const QString &command, mySession.restartCommand())
-    do_something(command);
-//! [10]
-
-
-//! [11]
-foreach (const QString &command, mySession.discardCommand())
-    do_something(command);
-//! [11]
-
+//! [6]
 
-//! [12]
+//! [7]
 QWidget *widget = qApp->widgetAt(x, y);
 if (widget)
     widget = widget->window();
-//! [12]
+//! [7]
 
 
-//! [13]
+//! [8]
 QWidget *widget = qApp->widgetAt(point);
 if (widget)
     widget = widget->window();
-//! [13]
+//! [8]