diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 16:48:51 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-24 17:40:17 +0200 |
| commit | cc54685b8d0610a682983418bd771e4d6f5f338b (patch) | |
| tree | 7eebd52afff683ef28e736e22cd78a6bd9b98100 /src/widgets/kernel/qwidget.cpp | |
| parent | 5d32552cf40d8ec15ed313f71559444c8765efd2 (diff) | |
Remove deprecated ApplicationAttribute enum values
In the declaration, leave them in as comments so that the gaps in the
numbering of the values doesn't create confusion.
Change-Id: I92ff299416896c471e7c7d80b988cd4642b6b756
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index d7cb7e2f10..e4e09c17be 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1063,9 +1063,6 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) if (++QWidgetPrivate::instanceCounter > QWidgetPrivate::maxInstances) QWidgetPrivate::maxInstances = QWidgetPrivate::instanceCounter; - if (QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation)) // ### fixme: Qt 6: Remove AA_ImmediateWidgetCreation. - q->create(); - QEvent e(QEvent::Create); QCoreApplication::sendEvent(q, &e); QCoreApplication::postEvent(q, new QEvent(QEvent::PolishRequest)); @@ -10411,10 +10408,6 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f) oldPaintManager->moveStaticWidgets(this); } - // ### fixme: Qt 6: Remove AA_ImmediateWidgetCreation. - if (QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation) && !testAttribute(Qt::WA_WState_Created)) - create(); - d->reparentFocusWidgets(oldtlw); setAttribute(Qt::WA_Resized, resized); |