Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1

Conflicts:
	.qmake.conf

Change-Id: I80957f4153719692cf2deede03ad09634c702fea

5 files changed, 28 insertions, 1 deletions

diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1
new file mode 100644
index 0000000..57adbce
--- /dev/null
+++ b/dist/changes-5.6.1
@@ -0,0 +1,24 @@
+Qt 5.6.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+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.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+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.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/examples/winextras/iconextractor/iconextractor.pro b/examples/winextras/iconextractor/iconextractor.pro
index b9ad5f6..a8a967c 100644
--- a/examples/winextras/iconextractor/iconextractor.pro
+++ b/examples/winextras/iconextractor/iconextractor.pro
@@ -4,3 +4,6 @@ CONFIG += console
 QT = core gui winextras
 LIBS += -lshell32
 SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/winextras/iconextractor
+INSTALLS += target
diff --git a/src/winextras/doc/images/glass.png b/src/winextras/doc/images/glass.png
index 513fe5d..a2a6326 100644
--- a/src/winextras/doc/images/glass.png
+++ b/src/winextras/doc/images/glass.png
diff --git a/src/winextras/doc/images/peek-on.png b/src/winextras/doc/images/peek-on.png
index 2ad48e9..c655639 100644
--- a/src/winextras/doc/images/peek-on.png
+++ b/src/winextras/doc/images/peek-on.png
diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf
index 46c3e95..27b991a 100644
--- a/src/winextras/doc/qtwinextras.qdocconf
+++ b/src/winextras/doc/qtwinextras.qdocconf
@@ -7,7 +7,7 @@ version                 = $QT_VERSION
 exampledirs += ../../../examples/winextras \
                snippets
 
-examplesinstallpath     = qtwinextras/winextras
+examplesinstallpath     = winextras
 
 headerdirs = .. ../../imports/winextras
 sourcedirs = .. ../../imports/winextras