diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-26 09:22:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-28 21:17:51 +0000 |
| commit | 1d9bb3c433e605e07e07a703422c6e837143e775 (patch) | |
| tree | 697c477f65c4a6401735f1bbbebe09a40202bd68 /src/designer/src/lib/uilib/formbuilder.cpp | |
| parent | 709c4a9c065a2a96f601c99374d7ce555226749f (diff) | |
Qt Designer: Port to new configure system
Replace the old QT_NO... define checks by the configure features where
applicable.
Join the sections for the QTimeEdit/QDateEdit (inheriting
QDateTimeEdit).
For the printer, introduce a define depending on the availability
of the printsupport library and QPrintDialog (cf textedit example)
to accommodate platforms that don't build QtPrintSupport.
Task-number: PYSIDE-797
Change-Id: I752d99a19b55616fa2ac5c36fad803d6d861e327
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/uilib/formbuilder.cpp')
| -rw-r--r-- | src/designer/src/lib/uilib/formbuilder.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index bbf356ba5..d5defe039 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -135,25 +135,25 @@ QWidget *QFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidget) d->setProcessingLayoutWidget(false); if (ui_widget->attributeClass() == QFormBuilderStrings::instance().qWidgetClass && !ui_widget->hasAttributeNative() && parentWidget -#ifndef QT_NO_MAINWINDOW +#if QT_CONFIG(mainwindow) && !qobject_cast<QMainWindow *>(parentWidget) #endif -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) && !qobject_cast<QToolBox *>(parentWidget) #endif -#ifndef QT_NO_STACKEDWIDGET +#if QT_CONFIG(stackedwidget) && !qobject_cast<QStackedWidget *>(parentWidget) #endif -#ifndef QT_NO_STACKEDWIDGET +#if QT_CONFIG(tabwidget) && !qobject_cast<QTabWidget *>(parentWidget) #endif -#ifndef QT_NO_SCROLLAREA +#if QT_CONFIG(scrollarea) && !qobject_cast<QScrollArea *>(parentWidget) #endif -#ifndef QT_NO_MDIAREA +#if QT_CONFIG(mdiarea) && !qobject_cast<QMdiArea *>(parentWidget) #endif -#ifndef QT_NO_DOCKWIDGET +#if QT_CONFIG(dockwidget) && !qobject_cast<QDockWidget *>(parentWidget) #endif ) { @@ -178,15 +178,15 @@ QWidget *QFormBuilder::createWidget(const QString &widgetName, QWidget *parentWi QWidget *w = 0; -#ifndef QT_NO_TABWIDGET +#if QT_CONFIG(tabwidget) if (qobject_cast<QTabWidget*>(parentWidget)) parentWidget = 0; #endif -#ifndef QT_NO_STACKEDWIDGET +#if QT_CONFIG(stackedwidget) if (qobject_cast<QStackedWidget*>(parentWidget)) parentWidget = 0; #endif -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) if (qobject_cast<QToolBox*>(parentWidget)) parentWidget = 0; #endif |