OSDN Git Service

fix build of accessible plugin
authorIvailo Monev <xakepa10@laimg.moc>
Thu, 29 Sep 2016 15:10:11 +0000 (15:10 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Thu, 29 Sep 2016 15:10:11 +0000 (15:10 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/plugins/accessible/widgets/complexwidgets.cpp
src/plugins/accessible/widgets/qaccessiblemenu.cpp
src/plugins/accessible/widgets/simplewidgets.cpp

index a255e26..6e5d272 100644 (file)
@@ -1860,7 +1860,7 @@ QString QAccessibleComboBox::text(Text t, int child) const
 #ifndef QT_NO_SHORTCUT
     case Accelerator:
         if (child == OpenList)
-            str = (QString)QKeySequence(Qt::Key_Down);
+            str = QKeySequence(Qt::Key_Down).toString();
         break;
 #endif
     default:
index 923aee4..f2b33a0 100644 (file)
@@ -105,7 +105,7 @@ QString QAccessibleMenu::text(Text t, int child) const
         return child ? menu()->actions().at(child-1)->whatsThis() : tx;
 #ifndef QT_NO_SHORTCUT
     case Accelerator:
-        return child ? static_cast<QString>(menu()->actions().at(child-1)->shortcut()) : tx;
+        return child ? menu()->actions().at(child-1)->shortcut().toString() : tx;
 #endif
     default:
         break;
index 3e93c18..fa01d48 100644 (file)
@@ -171,7 +171,7 @@ QString QAccessibleButton::text(Text t, int child) const
 #ifndef QT_NO_SHORTCUT
             QPushButton *pb = qobject_cast<QPushButton*>(object());
             if (pb && pb->isDefault())
-                str = (QString)QKeySequence(Qt::Key_Enter);
+                str = QKeySequence(Qt::Key_Enter).toString();
 #endif
             if (str.isEmpty())
                 str = qt_accHotKey(button()->text());