diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-06-03 14:05:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-03 22:25:54 +0200 |
| commit | eeb3c959334d1e6b4ea9f7538b603a711f8a8262 (patch) | |
| tree | a8e8336d2cc1de41e64ddfdfa4092b5afe329000 /src/controls/qquickmenuitem.cpp | |
| parent | 4e5bf941f1b3089c22392bb5416d44cb8defe47d (diff) | |
Buttons: Allow overriding of visual properties when 'action' is set
Those properties are, text, tooltip, iconName, and iconSource.
Also, properly capitalized gallery's tooltips.
Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/qquickmenuitem.cpp')
| -rw-r--r-- | src/controls/qquickmenuitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 622fdd2da..ed03b336e 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -503,7 +503,7 @@ void QQuickMenuItem::setBoundAction(QQuickAction *a) QString QQuickMenuItem::text() const { QString ownText = QQuickMenuText::text(); - if (!ownText.isEmpty()) + if (!ownText.isNull()) return ownText; return m_boundAction ? m_boundAction->text() : QString(); } |