diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-01 15:24:43 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-06 09:08:34 +0000 |
| commit | d5fe06a94ebbd2652034acfb64992ea4e744a1fe (patch) | |
| tree | 4d42438a0fbf715098f460b8d18c5995e7c85273 /tests/auto/tools/uic/baseline/chatmainwindow.ui.h | |
| parent | dc2512f3088d6f836ef06d35cbf1a5f7acb4ce7b (diff) | |
Make uic handle -no-feature-shortcut
Change-Id: I0f8c9fdc8b0fe573443cfc126f21e473544ddcba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/tools/uic/baseline/chatmainwindow.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/chatmainwindow.ui.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index 8cfd9b4851..7f8b026ba5 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -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 |