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

 Conflicts:
	.qmake.conf

Change-Id: I0b3b98813053be4eaba2109e50bbd5258da209b7

4 files changed, 32 insertions, 0 deletions

diff --git a/dist/changes-5.11.3 b/dist/changes-5.11.3
new file mode 100644
index 000000000..4e0a0b187
--- /dev/null
+++ b/dist/changes-5.11.3
@@ -0,0 +1,32 @@
+Qt 5.11.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.2.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               macdeployqt                                *
+****************************************************************************
+
+ - [QTBUG-68823] Now deploys plugins when Qt is configured with
+   -no-framework
+
+****************************************************************************
+*                                Assistant                                 *
+****************************************************************************
+
+ - [QTBUG-71399] Fix a crash when removing multiple documentation files
+   inside preferences dialog
diff --git a/src/designer/src/components/formeditor/images/win/filesave.png b/src/designer/src/components/formeditor/images/win/filesave.png
index 8feec99be..e65a29d5f 100644
--- a/src/designer/src/components/formeditor/images/win/filesave.png
+++ b/src/designer/src/components/formeditor/images/win/filesave.png
diff --git a/src/linguist/linguist/images/mac/filesave.png b/src/linguist/linguist/images/mac/filesave.png
index b41ecf531..e65a29d5f 100644
--- a/src/linguist/linguist/images/mac/filesave.png
+++ b/src/linguist/linguist/images/mac/filesave.png
diff --git a/src/linguist/linguist/images/win/filesave.png b/src/linguist/linguist/images/win/filesave.png
index 8feec99be..e65a29d5f 100644
--- a/src/linguist/linguist/images/win/filesave.png
+++ b/src/linguist/linguist/images/win/filesave.png