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/qtgradientview.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/qtgradientview.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/qtgradientview.ui.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/tools/uic/baseline/qtgradientview.ui.h b/tests/auto/tools/uic/baseline/qtgradientview.ui.h index 5847730235..14cb1da6b2 100644 --- a/tests/auto/tools/uic/baseline/qtgradientview.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientview.ui.h @@ -108,11 +108,11 @@ public: void retranslateUi(QWidget *QtGradientView) { - QtGradientView->setWindowTitle(QApplication::translate("QtGradientView", "Gradient View", 0)); - newButton->setText(QApplication::translate("QtGradientView", "New...", 0)); - editButton->setText(QApplication::translate("QtGradientView", "Edit...", 0)); - renameButton->setText(QApplication::translate("QtGradientView", "Rename", 0)); - removeButton->setText(QApplication::translate("QtGradientView", "Remove", 0)); + QtGradientView->setWindowTitle(QApplication::translate("QtGradientView", "Gradient View", Q_NULLPTR)); + newButton->setText(QApplication::translate("QtGradientView", "New...", Q_NULLPTR)); + editButton->setText(QApplication::translate("QtGradientView", "Edit...", Q_NULLPTR)); + renameButton->setText(QApplication::translate("QtGradientView", "Rename", Q_NULLPTR)); + removeButton->setText(QApplication::translate("QtGradientView", "Remove", Q_NULLPTR)); } // retranslateUi }; |