diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 18:47:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 18:47:27 +0200 |
| commit | d892e6f721b0163dfb2f2ecf79d80ba62304a542 (patch) | |
| tree | ccc1de7ece77bca11b20b3335126c337720d5e54 /tests/auto/tools/uic/baseline/remotecontrol.ui.h | |
| parent | 2997a60e1eaf0efbeb22516ae184fa93f278fec5 (diff) | |
| parent | 657c2bfbeceda3faa2c7a76b4ccec6a65a3445a2 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/qt_common.prf
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8
Diffstat (limited to 'tests/auto/tools/uic/baseline/remotecontrol.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/remotecontrol.ui.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/tools/uic/baseline/remotecontrol.ui.h b/tests/auto/tools/uic/baseline/remotecontrol.ui.h index b25f940450..00af983ed7 100644 --- a/tests/auto/tools/uic/baseline/remotecontrol.ui.h +++ b/tests/auto/tools/uic/baseline/remotecontrol.ui.h @@ -223,22 +223,22 @@ public: void retranslateUi(QMainWindow *RemoteControlClass) { - RemoteControlClass->setWindowTitle(QApplication::translate("RemoteControlClass", "RemoteControl", 0)); - actionQuit->setText(QApplication::translate("RemoteControlClass", "Quit", 0)); - label->setText(QApplication::translate("RemoteControlClass", "Start URL:", 0)); - launchButton->setText(QApplication::translate("RemoteControlClass", "Launch Qt HelpViewer", 0)); - actionGroupBox->setTitle(QApplication::translate("RemoteControlClass", "Actions", 0)); - label_2->setText(QApplication::translate("RemoteControlClass", "Search in Index:", 0)); + RemoteControlClass->setWindowTitle(QApplication::translate("RemoteControlClass", "RemoteControl", Q_NULLPTR)); + actionQuit->setText(QApplication::translate("RemoteControlClass", "Quit", Q_NULLPTR)); + label->setText(QApplication::translate("RemoteControlClass", "Start URL:", Q_NULLPTR)); + launchButton->setText(QApplication::translate("RemoteControlClass", "Launch Qt HelpViewer", Q_NULLPTR)); + actionGroupBox->setTitle(QApplication::translate("RemoteControlClass", "Actions", Q_NULLPTR)); + label_2->setText(QApplication::translate("RemoteControlClass", "Search in Index:", Q_NULLPTR)); indexButton->setText(QString()); - label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", 0)); + label_4->setText(QApplication::translate("RemoteControlClass", "Identifier:", Q_NULLPTR)); identifierButton->setText(QString()); - label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", 0)); + label_3->setText(QApplication::translate("RemoteControlClass", "Show URL:", Q_NULLPTR)); urlButton->setText(QString()); - syncContentsButton->setText(QApplication::translate("RemoteControlClass", "Sync Contents", 0)); - contentsCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Contents", 0)); - indexCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Index", 0)); - bookmarksCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Bookmarks", 0)); - menuFile->setTitle(QApplication::translate("RemoteControlClass", "File", 0)); + syncContentsButton->setText(QApplication::translate("RemoteControlClass", "Sync Contents", Q_NULLPTR)); + contentsCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Contents", Q_NULLPTR)); + indexCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Index", Q_NULLPTR)); + bookmarksCheckBox->setText(QApplication::translate("RemoteControlClass", "Show Bookmarks", Q_NULLPTR)); + menuFile->setTitle(QApplication::translate("RemoteControlClass", "File", Q_NULLPTR)); } // retranslateUi }; |