diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-22 13:42:22 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-13 18:53:12 +0000 |
commit | 24d1565789cbd31ce383ac789bb6d69116a77a09 (patch) | |
tree | f5b4e15ac728ec08519146672ad35d1f12c88539 /tests/auto/tools/uic/baseline/default.ui.h | |
parent | dbffff0116f9618902cf4e9615a0ca6a7a6db9ed (diff) |
uic: Use the Qt configure system when generating code
Replace the generation of #ifdef's for the macros by QT_CONFIG
checks. Implement it using streamable classes to make it easier
to switch the output language later.
Task-number: PYSIDE-797
Change-Id: I28b5ed3ec80cd525a3df0cd54d9be4f09149cde4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'tests/auto/tools/uic/baseline/default.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/default.ui.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h index fafff9d728..43de3c2f7c 100644 --- a/tests/auto/tools/uic/baseline/default.ui.h +++ b/tests/auto/tools/uic/baseline/default.ui.h @@ -192,13 +192,13 @@ public: statusbar = new QStatusBar(MainWindow); statusbar->setObjectName(QString::fromUtf8("statusbar")); MainWindow->setStatusBar(statusbar); -#ifndef QT_NO_SHORTCUT +#if QT_CONFIG(shortcut) nameLabel->setBuddy(nameCombo); ageLabel->setBuddy(ageSpinBox); passwordLabel->setBuddy(passwordEdit); label->setBuddy(professionList); countryLabel->setBuddy(professionList); -#endif // QT_NO_SHORTCUT +#endif // QT_CONFIG(shortcut) QWidget::setTabOrder(maleRadioButton, femaleRadioButton); QWidget::setTabOrder(femaleRadioButton, ageSpinBox); QWidget::setTabOrder(ageSpinBox, passwordEdit); @@ -237,36 +237,36 @@ public: nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", nullptr)); nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(tooltip) femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", nullptr)); genderLabel->setText(QApplication::translate("MainWindow", "Gender:", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_STATUSTIP +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(statustip) ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", nullptr)); -#endif // QT_NO_STATUSTIP +#endif // QT_CONFIG(statustip) ageLabel->setText(QApplication::translate("MainWindow", "&Age:", nullptr)); passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_STATUSTIP +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(statustip) passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", nullptr)); -#endif // QT_NO_STATUSTIP +#endif // QT_CONFIG(statustip) passwordEdit->setText(QApplication::translate("MainWindow", "Password", nullptr)); label->setText(QApplication::translate("MainWindow", "Profession", nullptr)); countryLabel->setText(QApplication::translate("MainWindow", "&Country", nullptr)); @@ -281,27 +281,27 @@ public: ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", nullptr)); professionList->setSortingEnabled(__sortingEnabled); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_STATUSTIP +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(statustip) professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); -#endif // QT_NO_STATUSTIP -#ifndef QT_NO_WHATSTHIS +#endif // QT_CONFIG(statustip) +#if QT_CONFIG(whatsthis) professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", nullptr)); -#endif // QT_NO_WHATSTHIS +#endif // QT_CONFIG(whatsthis) countryCombo->setItemText(0, QApplication::translate("MainWindow", "Germany", nullptr)); countryCombo->setItemText(1, QApplication::translate("MainWindow", "India", nullptr)); countryCombo->setItemText(2, QApplication::translate("MainWindow", "Norway", nullptr)); countryCombo->setItemText(3, QApplication::translate("MainWindow", "United States Of America", nullptr)); countryCombo->setItemText(4, QApplication::translate("MainWindow", "United Kingdom", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_STATUSTIP +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(statustip) countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", nullptr)); -#endif // QT_NO_STATUSTIP +#endif // QT_CONFIG(statustip) menu_File->setTitle(QApplication::translate("MainWindow", "&File", nullptr)); menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", nullptr)); } // retranslateUi |