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/qfiledialog.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/qfiledialog.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/qfiledialog.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h index aa974b61a4..24bf810f72 100644 --- a/tests/auto/tools/uic/baseline/qfiledialog.ui.h +++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h @@ -273,26 +273,26 @@ public: void retranslateUi(QDialog *QFileDialog) { - lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", 0)); + lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - backButton->setToolTip(QApplication::translate("QFileDialog", "Back", 0)); + backButton->setToolTip(QApplication::translate("QFileDialog", "Back", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", 0)); + forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", 0)); + toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", 0)); + newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", 0)); + listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", 0)); + detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", 0)); + fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", Q_NULLPTR)); Q_UNUSED(QFileDialog); } // retranslateUi |