diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-02 15:23:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 16:45:16 +0100 |
commit | b2bc9d276224bf8e9fe1a3953907cfbb8f3da837 (patch) | |
tree | 013f5ec9bcb397741aebd148a5fad3a225f3fe23 /src/widgets/kernel/qwidget.cpp | |
parent | e8f7fccf227a4b3c9fe533cd94e1ffec0107a208 (diff) |
Bump QCoreApplicationPrivate::app_compile_version to 0x050000
The minimum compile version is 0x050000 now, it cannot be less. Remove
checks for 0x040200 in the widget code, which provided compatibility in
the 4.x series for binaries compiled with 4.0 and 4.1.
Change-Id: Ia01da90de26dca6aeeb79d29c754cbeeecf809af
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index c419856838..91a4036001 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1227,11 +1227,9 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) if (++QWidgetPrivate::instanceCounter > QWidgetPrivate::maxInstances) QWidgetPrivate::maxInstances = QWidgetPrivate::instanceCounter; - if (QApplicationPrivate::app_compile_version < 0x040200 - || QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation)) + if (QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation)) q->create(); - QEvent e(QEvent::Create); QApplication::sendEvent(q, &e); QApplication::postEvent(q, new QEvent(QEvent::PolishRequest)); @@ -9673,9 +9671,7 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f) oldBs->moveStaticWidgets(this); } - if ((QApplicationPrivate::app_compile_version < 0x040200 - || QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation)) - && !testAttribute(Qt::WA_WState_Created)) + if (QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation) && !testAttribute(Qt::WA_WState_Created)) create(); d->reparentFocusWidgets(oldtlw); |