Compare commits

...

3 commits
v1.1 ... main

4 changed files with 8 additions and 8 deletions

View file

@ -62,7 +62,7 @@ Item {
Component.onCompleted: { Component.onCompleted: {
// Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger // Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger
if(shortcut != 0) { if(shortcut != 0 && shortcut != undefined) {
parent.parent.addShortcut(shortcut, root.triggered) parent.parent.addShortcut(shortcut, root.triggered)
} }
} }

View file

@ -23,7 +23,7 @@ When switching from QtQuick.Controls 2 to MixedMenu, the following changes need
|QtQuick.Controls2/Qt.labs | > |eu.ad5001.MixedMenu | |QtQuick.Controls2/Qt.labs | > |eu.ad5001.MixedMenu |
|-------------------------------------|---|--------------------------------------------------------| |-------------------------------------|---|--------------------------------------------------------|
|`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.0` | |`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.1` |
|`menuBar: MenuBar {}` | > |`MenuBar { id: appMenu }`<br>`menuBar: appMenu.trueItem`| |`menuBar: MenuBar {}` | > |`MenuBar { id: appMenu }`<br>`menuBar: appMenu.trueItem`|

View file

@ -17,7 +17,7 @@
*/ */
/*! /*!
\qmlmodule eu.ad5001.MixedMenu 1.0 \qmlmodule eu.ad5001.MixedMenu 1.1
\title MixedMenu QML Module \title MixedMenu QML Module
\brief Provides a near drop-in replacements for QtQuick.Controls menus allowing to use the platform native ones on supported platforms. \brief Provides a near drop-in replacements for QtQuick.Controls menus allowing to use the platform native ones on supported platforms.

10
qmldir
View file

@ -1,6 +1,6 @@
module eu.ad5001.MixedMenu module eu.ad5001.MixedMenu
MenuBar 1.0 MenuBar.qml MenuBar 1.1 MenuBar.qml
MenuItem 1.0 MenuItem.qml MenuItem 1.1 MenuItem.qml
Action 1.0 Action.qml Action 1.1 Action.qml
Menu 1.0 Menu.qml Menu 1.1 Menu.qml
MenuSeparator 1.0 MenuSeparator.qml MenuSeparator 1.1 MenuSeparator.qml