diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:08 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:09 +0200 |
commit | 9831118378c5d489f76089011277a1b7234a8d68 (patch) | |
tree | a67e82fde179fa727172fff9098758d60912189d /tests/auto/tools/uic/baseline/chatmainwindow.ui.h | |
parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'tests/auto/tools/uic/baseline/chatmainwindow.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/chatmainwindow.ui.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index 7f8b026ba5..2764761023 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -149,29 +149,29 @@ public: void retranslateUi(QMainWindow *ChatMainWindow) { - ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", Q_NULLPTR)); - actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", Q_NULLPTR)); + ChatMainWindow->setWindowTitle(QApplication::translate("ChatMainWindow", "Qt D-Bus Chat", nullptr)); + actionQuit->setText(QApplication::translate("ChatMainWindow", "Quit", nullptr)); #ifndef QT_NO_SHORTCUT - actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", Q_NULLPTR)); + actionQuit->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+Q", nullptr)); #endif // QT_NO_SHORTCUT - actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", Q_NULLPTR)); - actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", Q_NULLPTR)); + actionAboutQt->setText(QApplication::translate("ChatMainWindow", "About Qt...", nullptr)); + actionChangeNickname->setText(QApplication::translate("ChatMainWindow", "Change nickname...", nullptr)); #ifndef QT_NO_SHORTCUT - actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", Q_NULLPTR)); + actionChangeNickname->setShortcut(QApplication::translate("ChatMainWindow", "Ctrl+N", nullptr)); #endif // QT_NO_SHORTCUT #ifndef QT_NO_TOOLTIP - chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", Q_NULLPTR)); + chatHistory->setToolTip(QApplication::translate("ChatMainWindow", "Messages sent and received from other users", nullptr)); #endif // QT_NO_TOOLTIP - label->setText(QApplication::translate("ChatMainWindow", "Message:", Q_NULLPTR)); + label->setText(QApplication::translate("ChatMainWindow", "Message:", nullptr)); #ifndef QT_NO_TOOLTIP - sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", Q_NULLPTR)); + sendButton->setToolTip(QApplication::translate("ChatMainWindow", "Sends a message to other people", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS sendButton->setWhatsThis(QString()); #endif // QT_NO_WHATSTHIS - sendButton->setText(QApplication::translate("ChatMainWindow", "Send", Q_NULLPTR)); - menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", Q_NULLPTR)); - menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", Q_NULLPTR)); + sendButton->setText(QApplication::translate("ChatMainWindow", "Send", nullptr)); + menuQuit->setTitle(QApplication::translate("ChatMainWindow", "Help", nullptr)); + menuFile->setTitle(QApplication::translate("ChatMainWindow", "File", nullptr)); } // retranslateUi }; |