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/qpagesetupwidget.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/qpagesetupwidget.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h index 48f840f2f8..0c6fc92ea2 100644 --- a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h +++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h @@ -269,41 +269,41 @@ public: void retranslateUi(QWidget *QPageSetupWidget) { - QPageSetupWidget->setWindowTitle(QApplication::translate("QPageSetupWidget", "Form", 0)); - groupBox_2->setTitle(QApplication::translate("QPageSetupWidget", "Paper", 0)); - pageSizeLabel->setText(QApplication::translate("QPageSetupWidget", "Page size:", 0)); - widthLabel->setText(QApplication::translate("QPageSetupWidget", "Width:", 0)); - heightLabel->setText(QApplication::translate("QPageSetupWidget", "Height:", 0)); - paperSourceLabel->setText(QApplication::translate("QPageSetupWidget", "Paper source:", 0)); - groupBox_3->setTitle(QApplication::translate("QPageSetupWidget", "Orientation", 0)); - portrait->setText(QApplication::translate("QPageSetupWidget", "Portrait", 0)); - landscape->setText(QApplication::translate("QPageSetupWidget", "Landscape", 0)); - reverseLandscape->setText(QApplication::translate("QPageSetupWidget", "Reverse landscape", 0)); - reversePortrait->setText(QApplication::translate("QPageSetupWidget", "Reverse portrait", 0)); - groupBox->setTitle(QApplication::translate("QPageSetupWidget", "Margins", 0)); + QPageSetupWidget->setWindowTitle(QApplication::translate("QPageSetupWidget", "Form", Q_NULLPTR)); + groupBox_2->setTitle(QApplication::translate("QPageSetupWidget", "Paper", Q_NULLPTR)); + pageSizeLabel->setText(QApplication::translate("QPageSetupWidget", "Page size:", Q_NULLPTR)); + widthLabel->setText(QApplication::translate("QPageSetupWidget", "Width:", Q_NULLPTR)); + heightLabel->setText(QApplication::translate("QPageSetupWidget", "Height:", Q_NULLPTR)); + paperSourceLabel->setText(QApplication::translate("QPageSetupWidget", "Paper source:", Q_NULLPTR)); + groupBox_3->setTitle(QApplication::translate("QPageSetupWidget", "Orientation", Q_NULLPTR)); + portrait->setText(QApplication::translate("QPageSetupWidget", "Portrait", Q_NULLPTR)); + landscape->setText(QApplication::translate("QPageSetupWidget", "Landscape", Q_NULLPTR)); + reverseLandscape->setText(QApplication::translate("QPageSetupWidget", "Reverse landscape", Q_NULLPTR)); + reversePortrait->setText(QApplication::translate("QPageSetupWidget", "Reverse portrait", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("QPageSetupWidget", "Margins", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", 0)); + topMargin->setToolTip(QApplication::translate("QPageSetupWidget", "top margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", 0)); + topMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "top margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", 0)); + leftMargin->setToolTip(QApplication::translate("QPageSetupWidget", "left margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", 0)); + leftMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "left margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", 0)); + rightMargin->setToolTip(QApplication::translate("QPageSetupWidget", "right margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", 0)); + rightMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "right margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY #ifndef QT_NO_TOOLTIP - bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", 0)); + bottomMargin->setToolTip(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_ACCESSIBILITY - bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", 0)); + bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR)); #endif // QT_NO_ACCESSIBILITY } // retranslateUi |