From 5a6ee590a29f0fca0946cd666183b28b390783fa Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 20 Apr 2012 15:08:11 +0200 Subject: [PATCH] Remove deprecated conversion from QKeySequence to QString Change-Id: I3844913c16b9d6222f48e66dddc1d680458ffa56 Reviewed-by: Frederik Gladhorn --- src/plugins/accessible/widgets/complexwidgets.cpp | 2 +- src/widgets/accessible/qaccessiblewidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index e4b1067..8da6579 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -319,7 +319,7 @@ QString QAccessibleComboBox::text(QAccessible::Text t) const break; #ifndef QT_NO_SHORTCUT case QAccessible::Accelerator: - str = (QString)QKeySequence(Qt::Key_Down); + str = QKeySequence(Qt::Key_Down).toString(QKeySequence::NativeText); break; #endif default: diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index f2ba5a6..2f091c7 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -147,7 +147,7 @@ QString Q_WIDGETS_EXPORT qt_accHotKey(const QString &text) { int ampIndex = qt_accAmpIndex(text); if (ampIndex != -1) - return (QString)QKeySequence(Qt::ALT) + text.at(ampIndex + 1); + return QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + text.at(ampIndex + 1); return QString(); } -- 2.7.4