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/calculator.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/calculator.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/calculator.ui.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/tools/uic/baseline/calculator.ui.h b/tests/auto/tools/uic/baseline/calculator.ui.h index 7ac878e3fb..88644eaaaf 100644 --- a/tests/auto/tools/uic/baseline/calculator.ui.h +++ b/tests/auto/tools/uic/baseline/calculator.ui.h @@ -159,34 +159,34 @@ public: void retranslateUi(QWidget *Calculator) { - Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", 0)); - backspaceButton->setText(QApplication::translate("Calculator", "Backspace", 0)); - clearButton->setText(QApplication::translate("Calculator", "Clear", 0)); - clearAllButton->setText(QApplication::translate("Calculator", "Clear All", 0)); - clearMemoryButton->setText(QApplication::translate("Calculator", "MC", 0)); - readMemoryButton->setText(QApplication::translate("Calculator", "MR", 0)); - setMemoryButton->setText(QApplication::translate("Calculator", "MS", 0)); - addToMemoryButton->setText(QApplication::translate("Calculator", "M+", 0)); - sevenButton->setText(QApplication::translate("Calculator", "7", 0)); - eightButton->setText(QApplication::translate("Calculator", "8", 0)); - nineButton->setText(QApplication::translate("Calculator", "9", 0)); - fourButton->setText(QApplication::translate("Calculator", "4", 0)); - fiveButton->setText(QApplication::translate("Calculator", "5", 0)); - sixButton->setText(QApplication::translate("Calculator", "6", 0)); - oneButton->setText(QApplication::translate("Calculator", "1", 0)); - twoButton->setText(QApplication::translate("Calculator", "2", 0)); - threeButton->setText(QApplication::translate("Calculator", "3", 0)); - zeroButton->setText(QApplication::translate("Calculator", "0", 0)); - pointButton->setText(QApplication::translate("Calculator", ".", 0)); - changeSignButton->setText(QApplication::translate("Calculator", "+-", 0)); - plusButton->setText(QApplication::translate("Calculator", "+", 0)); - divisionButton->setText(QApplication::translate("Calculator", "/", 0)); - timesButton->setText(QApplication::translate("Calculator", "*", 0)); - minusButton->setText(QApplication::translate("Calculator", "-", 0)); - squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", 0)); - powerButton->setText(QApplication::translate("Calculator", "x^2", 0)); - reciprocalButton->setText(QApplication::translate("Calculator", "1/x", 0)); - equalButton->setText(QApplication::translate("Calculator", "=", 0)); + Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", Q_NULLPTR)); + backspaceButton->setText(QApplication::translate("Calculator", "Backspace", Q_NULLPTR)); + clearButton->setText(QApplication::translate("Calculator", "Clear", Q_NULLPTR)); + clearAllButton->setText(QApplication::translate("Calculator", "Clear All", Q_NULLPTR)); + clearMemoryButton->setText(QApplication::translate("Calculator", "MC", Q_NULLPTR)); + readMemoryButton->setText(QApplication::translate("Calculator", "MR", Q_NULLPTR)); + setMemoryButton->setText(QApplication::translate("Calculator", "MS", Q_NULLPTR)); + addToMemoryButton->setText(QApplication::translate("Calculator", "M+", Q_NULLPTR)); + sevenButton->setText(QApplication::translate("Calculator", "7", Q_NULLPTR)); + eightButton->setText(QApplication::translate("Calculator", "8", Q_NULLPTR)); + nineButton->setText(QApplication::translate("Calculator", "9", Q_NULLPTR)); + fourButton->setText(QApplication::translate("Calculator", "4", Q_NULLPTR)); + fiveButton->setText(QApplication::translate("Calculator", "5", Q_NULLPTR)); + sixButton->setText(QApplication::translate("Calculator", "6", Q_NULLPTR)); + oneButton->setText(QApplication::translate("Calculator", "1", Q_NULLPTR)); + twoButton->setText(QApplication::translate("Calculator", "2", Q_NULLPTR)); + threeButton->setText(QApplication::translate("Calculator", "3", Q_NULLPTR)); + zeroButton->setText(QApplication::translate("Calculator", "0", Q_NULLPTR)); + pointButton->setText(QApplication::translate("Calculator", ".", Q_NULLPTR)); + changeSignButton->setText(QApplication::translate("Calculator", "+-", Q_NULLPTR)); + plusButton->setText(QApplication::translate("Calculator", "+", Q_NULLPTR)); + divisionButton->setText(QApplication::translate("Calculator", "/", Q_NULLPTR)); + timesButton->setText(QApplication::translate("Calculator", "*", Q_NULLPTR)); + minusButton->setText(QApplication::translate("Calculator", "-", Q_NULLPTR)); + squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", Q_NULLPTR)); + powerButton->setText(QApplication::translate("Calculator", "x^2", Q_NULLPTR)); + reciprocalButton->setText(QApplication::translate("Calculator", "1/x", Q_NULLPTR)); + equalButton->setText(QApplication::translate("Calculator", "=", Q_NULLPTR)); } // retranslateUi }; |