whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make uic handle -no-feature-shortcut 

Change-Id: I0f8c9fdc8b0fe573443cfc126f21e473544ddcba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Paul Olav Tvete 2017-03-01 15:24:43 +01:00
parent dc2512f308
commit d5fe06a94e
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -1484,6 +1484,8 @@ void WriteInitialization::writeProperties(const QString &varName,
defineC = whatsThisDefineC;
else if (propertyName == QLatin1String("statusTip"))
defineC = statusTipDefineC;
else if (propertyName == QLatin1String("shortcut"))
defineC = shortcutDefineC;
else if (propertyName == QLatin1String("accessibleName") || propertyName == QLatin1String("accessibleDescription"))
defineC = accessibilityDefineC;

6
tests/auto/tools/uic/baseline/chatmainwindow.ui.h
View File

@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading UI file 'chatmainwindow.ui'
**
** Created by: Qt User Interface Compiler version 5.0.0
** Created by: Qt User Interface Compiler version 5.9.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
@ -151,10 +151,14 @@ public:
{
ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", Q_NULLPTR));
actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", Q_NULLPTR));
#ifndef QT_NO_SHORTCUT
actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", Q_NULLPTR));
#endif // QT_NO_SHORTCUT
actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", Q_NULLPTR));
actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", Q_NULLPTR));
#ifndef QT_NO_SHORTCUT
actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", Q_NULLPTR));
#endif // QT_NO_SHORTCUT
#ifndef QT_NO_TOOLTIP
chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", Q_NULLPTR));
#endif // QT_NO_TOOLTIP

4
tests/auto/tools/uic/baseline/mydialog.ui.h
View File

@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading UI file 'mydialog.ui'
**
** Created by: Qt User Interface Compiler version 5.0.0
** Created by: Qt User Interface Compiler version 5.9.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
@ -62,7 +62,9 @@ public:
MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", Q_NULLPTR));
aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", Q_NULLPTR));
aButton->setText(QApplication::translate("MyDialog", "&Quit", Q_NULLPTR));
#ifndef QT_NO_SHORTCUT
aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", Q_NULLPTR));
#endif // QT_NO_SHORTCUT
} // retranslateUi
};

4
tests/auto/tools/uic/baseline/trpreviewtool.ui.h
View File

@ -31,7 +31,7 @@
/********************************************************************************
** Form generated from reading UI file 'trpreviewtool.ui'
**
** Created by: Qt User Interface Compiler version 5.0.0
** Created by: Qt User Interface Compiler version 5.9.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
@ -168,7 +168,9 @@ public:
actionOpenForm->setText(QApplication::translate("TrPreviewToolClass", "&Open Form...", Q_NULLPTR));
actionLoadTranslation->setText(QApplication::translate("TrPreviewToolClass", "&Load Translation...", Q_NULLPTR));
actionReloadTranslations->setText(QApplication::translate("TrPreviewToolClass", "&Reload Translations", Q_NULLPTR));
#ifndef QT_NO_SHORTCUT
actionReloadTranslations->setShortcut(QApplication::translate("TrPreviewToolClass", "F5", Q_NULLPTR));
#endif // QT_NO_SHORTCUT
actionClose->setText(QApplication::translate("TrPreviewToolClass", "&Close", Q_NULLPTR));
actionAbout->setText(QApplication::translate("TrPreviewToolClass", "About", Q_NULLPTR));
actionAbout_Qt->setText(QApplication::translate("TrPreviewToolClass", "About Qt", Q_NULLPTR));