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

Conflicts:
	.qmake.conf

Change-Id: I0e3a17d947087a01ea98826c73ad190165751c04

1 files changed, 7 insertions, 2 deletions

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" }