Remove deprecated conversion from QKeySequence to QString
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 20 Apr 2012 13:08:11 +0000 (15:08 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Apr 2012 22:56:40 +0000 (00:56 +0200)
Change-Id: I3844913c16b9d6222f48e66dddc1d680458ffa56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
src/plugins/accessible/widgets/complexwidgets.cpp
src/widgets/accessible/qaccessiblewidget.cpp

index e4b1067..8da6579 100644 (file)
@@ -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:
index f2ba5a6..2f091c7 100644 (file)
@@ -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();
 }