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

Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0

1 files changed, 8 insertions, 3 deletions

diff --git a/examples/widgets/mainwindows/application/mainwindow.cpp b/examples/widgets/mainwindows/application/mainwindow.cpp
index 8bdd0303de..a5a0def0a6 100644
--- a/examples/widgets/mainwindows/application/mainwindow.cpp
+++ b/examples/widgets/mainwindows/application/mainwindow.cpp
@@ -118,11 +118,16 @@ bool MainWindow::save()
 bool MainWindow::saveAs()
 //! [11] //! [12]
 {
-    QString fileName = QFileDialog::getSaveFileName(this);
-    if (fileName.isEmpty())
+    QFileDialog dialog(this);
+    dialog.setWindowModality(Qt::WindowModal);
+    dialog.setAcceptMode(QFileDialog::AcceptSave);
+    dialog.exec();
+    QStringList files = dialog.selectedFiles();
+
+    if (files.isEmpty())
         return false;
 
-    return saveFile(fileName);
+    return saveFile(files.at(0));
 }
 //! [12]