Visualize mnemonics

Unfortunately this comes a bit late in the 5.10 cycle, but this should
be released together with the rest of the mnemonics stuff going out in
5.10, because it affects the value of AbstractButton/Menu(Bar)Item::text.
As the removed TODO comments and altered tests indicate, previously the
ampersand was blatantly stripped out. It would be worse to change it
later once people have already started using mnemonics and rely on the
behavior in custom styles.

The necessary modifications to QQuickText were added in qtdeclarative
commit 65ef4ba.

Task-number: QTBUG-61422
Change-Id: Iaa73da8c012e9a6019743cf98f5bdc02527064e5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quickcontrols2/qquickiconlabel_p_p.h b/src/quickcontrols2/qquickiconlabel_p_p.h
index 5762187c..f0f4df4c 100644
--- a/src/quickcontrols2/qquickiconlabel_p_p.h
+++ b/src/quickcontrols2/qquickiconlabel_p_p.h
@@ -54,8 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickText;
 class QQuickIconImage;
+class QQuickMnemonicLabel;
 
 class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 {
@@ -105,7 +105,7 @@ public:
     QString text;
     QQuickIcon icon;
     QQuickIconImage *image;
-    QQuickText *label;
+    QQuickMnemonicLabel *label;
 };
 
 QT_END_NAMESPACE