diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:04:47 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:04:47 +0100 |
| commit | 7dee76ca7bfdf12e3d98a309c8a913409265863c (patch) | |
| tree | 54ded69c9958ffe0906eff99e1977648c633efbb /src/controls/qquickmenuitem.cpp | |
| parent | 49285034d2f1235bc3caa99fc895ecf70393f380 (diff) | |
| parent | 1ce34aa1c88d98120c3f632caffac19c2a834deb (diff) | |
Merge 5.4 into 5.4.1
Change-Id: I5a1536a048d8ee0b727331b0e2ec4bd211544d87
Diffstat (limited to 'src/controls/qquickmenuitem.cpp')
| -rw-r--r-- | src/controls/qquickmenuitem.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 275a6fa71..447db00c6 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -177,8 +177,9 @@ void QQuickMenuBase::setVisualItem(QQuickItem *item) /*! \qmlproperty enumeration MenuSeparator::type + \readonly - This property is read-only and constant, and its value is \l MenuItemType.Separator. + This property is read-only and constant, and its value is \c MenuItemType.Separator. */ QQuickMenuSeparator::QQuickMenuSeparator(QObject *parent) @@ -320,8 +321,9 @@ void QQuickMenuText::updateIcon() /*! \qmlproperty enumeration MenuItem::type + \readonly - This property is read-only and constant, and its value is \l MenuItemType.Item. + This property is read-only and constant, and its value is \c MenuItemType.Item. */ /*! |