From d222bd1cc584de025864c40f9d26ea76fd9aaf34 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Date: Sun, 29 Oct 2017 12:56:05 +0100
Subject: [PATCH] Update qmltypes

---
 src/imports/controls/plugins.qmltypes | 45 ++++++++++++++-------------
 src/imports/core/plugins.qmltypes     | 16 ++++++++++
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 3c97da81..54149097 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -11,6 +11,7 @@ Module {
         "Fluid.Core 1.0",
         "Fluid.Effects 1.0",
         "Fluid.Layouts 1.0",
+        "Qt.labs.calendar 1.0",
         "QtGraphicalEffects 1.0",
         "QtQml 2.2",
         "QtQuick 2.9",
@@ -101,27 +102,27 @@ Module {
     }
     Component {
         prototype: "QQuickRectangle"
-        name: "QtQuick.Controls.Universal.impl/CheckIndicator 2.0"
-        exports: ["QtQuick.Controls.Universal.impl/CheckIndicator 2.0"]
+        name: "QtQuick.Controls.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "partiallyChecked"; type: "bool"; isReadonly: true }
     }
     Component {
         prototype: "QQuickRectangle"
-        name: "QtQuick.Controls.Material.impl/CheckIndicator 2.0"
-        exports: ["QtQuick.Controls.Material.impl/CheckIndicator 2.0"]
+        name: "QtQuick.Controls.Universal.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/CheckIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "partiallyChecked"; type: "bool"; isReadonly: true }
     }
     Component {
         prototype: "QQuickRectangle"
-        name: "QtQuick.Controls.impl/CheckIndicator 2.0"
-        exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
+        name: "QtQuick.Controls.Material.impl/CheckIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/CheckIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -328,17 +329,17 @@ Module {
     }
     Component {
         prototype: "QQuickRectangle"
-        name: "QtQuick.Controls.impl/RadioIndicator 2.0"
-        exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
+        name: "QtQuick.Controls.Universal.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/RadioIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
-        Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "control"; type: "QVariant" }
     }
     Component {
         prototype: "QQuickRectangle"
-        name: "QtQuick.Controls.Material.impl/RadioIndicator 2.0"
-        exports: ["QtQuick.Controls.Material.impl/RadioIndicator 2.0"]
+        name: "QtQuick.Controls.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -346,12 +347,12 @@ Module {
     }
     Component {
         prototype: "QQuickRectangle"
-        name: "QtQuick.Controls.Universal.impl/RadioIndicator 2.0"
-        exports: ["QtQuick.Controls.Universal.impl/RadioIndicator 2.0"]
+        name: "QtQuick.Controls.Material.impl/RadioIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/RadioIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
-        Property { name: "control"; type: "QVariant" }
+        Property { name: "control"; type: "QQuickItem"; isPointer: true }
     }
     Component {
         prototype: "QQuickRangeSlider"
@@ -479,8 +480,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.Controls.impl/SwitchIndicator 2.0"
-        exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"]
+        name: "QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -488,22 +489,22 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.Controls.Material.impl/SwitchIndicator 2.0"
-        exports: ["QtQuick.Controls.Material.impl/SwitchIndicator 2.0"]
+        name: "QtQuick.Controls.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
-        Property { name: "handle"; type: "QQuickRectangle"; isReadonly: true; isPointer: true }
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"
-        exports: ["QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"]
+        name: "QtQuick.Controls.Material.impl/SwitchIndicator 2.0"
+        exports: ["QtQuick.Controls.Material.impl/SwitchIndicator 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "control"; type: "QQuickItem"; isPointer: true }
+        Property { name: "handle"; type: "QQuickRectangle"; isReadonly: true; isPointer: true }
     }
     Component {
         prototype: "QQuickTabBar"
diff --git a/src/imports/core/plugins.qmltypes b/src/imports/core/plugins.qmltypes
index 69a185ed..a1328b27 100644
--- a/src/imports/core/plugins.qmltypes
+++ b/src/imports/core/plugins.qmltypes
@@ -225,6 +225,22 @@ Module {
             Parameter { name: "dirName"; type: "string" }
         }
     }
+    Component {
+        name: "WindowDecoration"
+        prototype: "QObject"
+        exports: ["Fluid.Core/WindowDecoration 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Theme"
+            values: {
+                "Light": 0,
+                "Dark": 1
+            }
+        }
+        Property { name: "window"; type: "QWindow"; isPointer: true }
+        Property { name: "theme"; type: "Theme" }
+        Property { name: "color"; type: "QColor" }
+    }
     Component {
         prototype: "QObject"
         name: "Utils 1.0"