diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /tests/auto/tools/uic/baseline/form.ui.h | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'tests/auto/tools/uic/baseline/form.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/form.ui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/uic/baseline/form.ui.h b/tests/auto/tools/uic/baseline/form.ui.h index 0b82a41f5d..89a08c2050 100644 --- a/tests/auto/tools/uic/baseline/form.ui.h +++ b/tests/auto/tools/uic/baseline/form.ui.h @@ -126,9 +126,9 @@ public: void retranslateUi(QWidget *WorldTimeForm) { - WorldTimeForm->setWindowTitle(QApplication::translate("WorldTimeForm", "World Time Clock", 0)); - label->setText(QApplication::translate("WorldTimeForm", "Current time:", 0)); - label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", 0)); + WorldTimeForm->setWindowTitle(QApplication::translate("WorldTimeForm", "World Time Clock", Q_NULLPTR)); + label->setText(QApplication::translate("WorldTimeForm", "Current time:", Q_NULLPTR)); + label_2->setText(QApplication::translate("WorldTimeForm", "Set time zone:", Q_NULLPTR)); } // retranslateUi }; |