From f0d6a9617454089cf8d03ec7c775ee1aedb768ce Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Fri, 23 Jul 2021 00:37:42 +0200
Subject: [PATCH] Now using the proper icon properties! Also removing debug.

---
 Action.qml   | 5 +----
 MenuBar.qml  | 1 -
 MenuItem.qml | 4 +---
 README.md    | 3 ---
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Action.qml b/Action.qml
index d9fcaa1..ae23daa 100644
--- a/Action.qml
+++ b/Action.qml
@@ -42,9 +42,7 @@ Item {
     property alias enabled: controlsAction.enabled
     property alias shortcut: controlsAction.shortcut
     property alias text: controlsAction.text
-    property alias iconName: controlsAction.icon.name
-    property alias iconSource: controlsAction.icon.source
-    property alias iconColor: controlsAction.icon.color
+    property alias icon: controlsAction.icon
     
     Native.MenuItem {
         id: nativeAction
@@ -65,7 +63,6 @@ Item {
     Component.onCompleted: {
         // Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger
         if(shortcut != 0) {
-            console.log("Adding shortcut for", text, "with shortcut", shortcut)
             parent.parent.addShortcut(shortcut, root.triggered)
         }
     }
diff --git a/MenuBar.qml b/MenuBar.qml
index 18c091a..f4aee94 100644
--- a/MenuBar.qml
+++ b/MenuBar.qml
@@ -95,6 +95,5 @@ Item {
         }`, root, "shortcut" + sequence);
         newShortcut.sequence = sequence
         newShortcut.activated.connect(trigger)
-        console.log("Added shortcut " + sequence)
     }
 }
diff --git a/MenuItem.qml b/MenuItem.qml
index bd74dac..c82d37b 100644
--- a/MenuItem.qml
+++ b/MenuItem.qml
@@ -42,9 +42,7 @@ Item {
     property bool enabled: true
     property font font: trueItem.font
     property string text: ""
-    property alias iconName: controlsMenuItem.icon.name
-    property alias iconSource: controlsMenuItem.icon.source
-    property alias iconColor: controlsMenuItem.icon.color
+    property alias icon: controlsMenuItem.icon
     
     Native.MenuItem {
         id: nativeMenuItem
diff --git a/README.md b/README.md
index 45d9855..56e56bb 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,6 @@ When switching from QtQuick.Controls 2 to MixedMenu, the following changes need
 |QtQuick.Controls2/Qt.labs            | > |eu.ad5001.MixedMenu                                     |
 |-------------------------------------|---|--------------------------------------------------------|
 |`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.0`                        |
-|`icon.name: ...`                     | > |`iconName: ...`                                         |
-|`icon.source: ...`                   | > |`iconSource: ...`                                       |
-|`icon.color: ...`                    | > |`iconColor: ...`                                        |
 |`menuBar: MenuBar {}`                | > |`MenuBar { id: appMenu }`<br>`menuBar: appMenu.trueItem`|