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/formwindowsettings.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/formwindowsettings.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/formwindowsettings.ui.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h index 5b3c3c2368..2aafa8b6c0 100644 --- a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h +++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h @@ -274,17 +274,17 @@ public: void retranslateUi(QDialog *FormWindowSettings) { - FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", 0)); - layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", 0)); - label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", 0)); - label->setText(QApplication::translate("FormWindowSettings", "&Margin:", 0)); - layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", 0)); - label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", 0)); - label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", 0)); - pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", 0)); - includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", 0)); - pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", 0)); - gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", 0)); + FormWindowSettings->setWindowTitle(QApplication::translate("FormWindowSettings", "Form Settings", Q_NULLPTR)); + layoutDefaultGroupBox->setTitle(QApplication::translate("FormWindowSettings", "Layout &Default", Q_NULLPTR)); + label_2->setText(QApplication::translate("FormWindowSettings", "&Spacing:", Q_NULLPTR)); + label->setText(QApplication::translate("FormWindowSettings", "&Margin:", Q_NULLPTR)); + layoutFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Layout Function", Q_NULLPTR)); + label_3->setText(QApplication::translate("FormWindowSettings", "Ma&rgin:", Q_NULLPTR)); + label_3_2->setText(QApplication::translate("FormWindowSettings", "Spa&cing:", Q_NULLPTR)); + pixmapFunctionGroupBox_2->setTitle(QApplication::translate("FormWindowSettings", "&Author", Q_NULLPTR)); + includeHintsGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Include Hints", Q_NULLPTR)); + pixmapFunctionGroupBox->setTitle(QApplication::translate("FormWindowSettings", "&Pixmap Function", Q_NULLPTR)); + gridPanel->setTitle(QApplication::translate("FormWindowSettings", "Grid", Q_NULLPTR)); } // retranslateUi }; |