summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/uic/baseline/mydialog.ui.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-15 19:47:57 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-15 19:47:57 +0200
commit40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch)
treea8ceb093a098a38b29c0fe27e41af480ae10b876 /tests/auto/tools/uic/baseline/mydialog.ui.h
parent446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff)
parent6b2071c697d4c48f0cd289b28b443ebffc3432e6 (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/mydialog.ui.h')
-rw-r--r--tests/auto/tools/uic/baseline/mydialog.ui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/uic/baseline/mydialog.ui.h b/tests/auto/tools/uic/baseline/mydialog.ui.h
index 6f2462611b..061b476f63 100644
--- a/tests/auto/tools/uic/baseline/mydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/mydialog.ui.h
@@ -59,10 +59,10 @@ public:
void retranslateUi(QDialog *MyDialog)
{
- MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", 0));
- aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", 0));
- aButton->setText(QApplication::translate("MyDialog", "&Quit", 0));
- aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", 0));
+ MyDialog->setWindowTitle(QApplication::translate("MyDialog", "Mach 2!", Q_NULLPTR));
+ aLabel->setText(QApplication::translate("MyDialog", "Join the life in the fastlane; - PCH enable your project today! -", Q_NULLPTR));
+ aButton->setText(QApplication::translate("MyDialog", "&Quit", Q_NULLPTR));
+ aButton->setShortcut(QApplication::translate("MyDialog", "Alt+Q", Q_NULLPTR));
} // retranslateUi
};