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/icontheme.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/icontheme.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/icontheme.ui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h index 28fd27475d..f9cc837761 100644 --- a/tests/auto/tools/uic/baseline/icontheme.ui.h +++ b/tests/auto/tools/uic/baseline/icontheme.ui.h @@ -77,10 +77,10 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0)); - fileicon->setText(QApplication::translate("Form", "fileicon", 0)); - fileandthemeicon->setText(QApplication::translate("Form", "PushButton", 0)); - themeicon->setText(QApplication::translate("Form", "PushButton", 0)); + Form->setWindowTitle(QApplication::translate("Form", "Form", Q_NULLPTR)); + fileicon->setText(QApplication::translate("Form", "fileicon", Q_NULLPTR)); + fileandthemeicon->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); + themeicon->setText(QApplication::translate("Form", "PushButton", Q_NULLPTR)); } // retranslateUi }; |