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/stringlisteditor.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/stringlisteditor.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/stringlisteditor.ui.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h index fd78ce91c1..941c73799b 100644 --- a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h @@ -201,9 +201,9 @@ public: vboxLayout->addWidget(buttonBox); -#ifndef QT_NO_SHORTCUT +#if QT_CONFIG(shortcut) label->setBuddy(valueEdit); -#endif // QT_NO_SHORTCUT +#endif // QT_CONFIG(shortcut) retranslateUi(qdesigner_internal__Dialog); QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__Dialog, SLOT(accept())); @@ -216,22 +216,22 @@ public: { qdesigner_internal__Dialog->setWindowTitle(QApplication::translate("qdesigner_internal::Dialog", "Dialog", nullptr)); groupBox->setTitle(QApplication::translate("qdesigner_internal::Dialog", "StringList", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) newButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "New String", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) newButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&New", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) deleteButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Delete String", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) deleteButton->setText(QApplication::translate("qdesigner_internal::Dialog", "&Delete", nullptr)); label->setText(QApplication::translate("qdesigner_internal::Dialog", "&Value:", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) upButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Up", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) upButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Up", nullptr)); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) downButton->setToolTip(QApplication::translate("qdesigner_internal::Dialog", "Move String Down", nullptr)); -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) downButton->setText(QApplication::translate("qdesigner_internal::Dialog", "Down", nullptr)); } // retranslateUi |