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

Conflicts:
	.qmake.conf

Change-Id: I0e3a17d947087a01ea98826c73ad190165751c04

3 files changed, 40 insertions, 3 deletions

diff --git a/dist/changes-5.4.0 b/dist/changes-5.4.0
new file mode 100644
index 0000000..bf6ba87
--- /dev/null
+++ b/dist/changes-5.4.0
@@ -0,0 +1,32 @@
+Qt 5.4 introduces many new features and improvements as well as bugfixes
+over the 5.3.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.4
+
+The Qt version 5.4 series is binary compatible with the 5.3.x series.
+Applications compiled for 5.3 will continue to run with 5.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               Library                                    *
+****************************************************************************
+
+QWinMime
+--------
+
+ - [QTBUG-39559] Added abstract class QWinMime (equivalent to WindowsMime
+   in Qt 4) for registering custom mime type conversions.
+
+QWinThumbnailToolBar
+--------------------
+
+ - [QTBUG-36730] Added pixmap properties and change notifications for
+   thumbnail icons and live preview.
diff --git a/src/imports/winextras/plugins.qmltypes b/src/imports/winextras/plugins.qmltypes
index eb1aa15..8a00138 100644
--- a/src/imports/winextras/plugins.qmltypes
+++ b/src/imports/winextras/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtWinExtras 1.0'
+// 'qmlplugindump.exe -nonrelocatable QtWinExtras 1.0'
 
 Module {
     Component {
@@ -78,6 +78,7 @@ Module {
         name: "QQuickTaskbarOverlay"
         prototype: "QObject"
         exports: ["QtWinExtras/TaskbarOverlay 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "iconSource"; type: "QUrl" }
         Property { name: "accessibleDescription"; type: "string" }
@@ -91,9 +92,11 @@ Module {
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "buttons"; type: "QQuickThumbnailToolButton"; isList: true; isReadonly: true }
+        Property { name: "iconicNotificationsEnabled"; type: "bool" }
         Property { name: "iconicThumbnailSource"; type: "QUrl" }
         Property { name: "iconicLivePreviewSource"; type: "QUrl" }
-        Property { name: "iconicNotificationsEnabled"; type: "bool" }
+        Signal { name: "iconicThumbnailRequested" }
+        Signal { name: "iconicLivePreviewRequested" }
         Method { name: "clear" }
         Method {
             name: "addButton"
@@ -122,6 +125,7 @@ Module {
         name: "QQuickWin"
         prototype: "QObject"
         exports: ["QtWinExtras/QtWin 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "HBitmapFormat"
@@ -144,6 +148,7 @@ Module {
         name: "QWinTaskbarProgress"
         prototype: "QObject"
         exports: ["QtWinExtras/TaskbarProgress 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "value"; type: "int" }
         Property { name: "minimum"; type: "int" }
diff --git a/src/winextras/doc/snippets/code/thumbbar.cpp b/src/winextras/doc/snippets/code/thumbbar.cpp
index 268a615..a3c4a58 100644
--- a/src/winextras/doc/snippets/code/thumbbar.cpp
+++ b/src/winextras/doc/snippets/code/thumbbar.cpp
@@ -44,7 +44,7 @@ void initializeThumbnailToolBar(QWidget *widget)
 {
     Q_ASSERT(widget->windowHandle()); // Note: this requires the window to be shown.
 //! [thumbbar_cpp]
-    QWinThumbnailToolBar *thumbbar = QWinThumbnailToolBar(widget);
+    QWinThumbnailToolBar *thumbbar = new QWinThumbnailToolBar(widget);
     thumbbar->setWindow(widget->windowHandle());
 
     QWinThumbnailToolButton *settings = new QWinThumbnailToolButton(thumbbar);