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/plugindialog.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/plugindialog.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/plugindialog.ui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/plugindialog.ui.h b/tests/auto/tools/uic/baseline/plugindialog.ui.h index d7fb99dc9c..d8b034b9ee 100644 --- a/tests/auto/tools/uic/baseline/plugindialog.ui.h +++ b/tests/auto/tools/uic/baseline/plugindialog.ui.h @@ -113,11 +113,11 @@ public: void retranslateUi(QDialog *PluginDialog) { - PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", 0)); - label->setText(QApplication::translate("PluginDialog", "TextLabel", 0)); + PluginDialog->setWindowTitle(QApplication::translate("PluginDialog", "Plugin Information", Q_NULLPTR)); + label->setText(QApplication::translate("PluginDialog", "TextLabel", Q_NULLPTR)); QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem(); - ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", 0)); - message->setText(QApplication::translate("PluginDialog", "TextLabel", 0)); + ___qtreewidgetitem->setText(0, QApplication::translate("PluginDialog", "1", Q_NULLPTR)); + message->setText(QApplication::translate("PluginDialog", "TextLabel", Q_NULLPTR)); } // retranslateUi }; |