From b2bc9d276224bf8e9fe1a3953907cfbb8f3da837 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 2 Nov 2011 15:23:50 +0100 Subject: [PATCH] Bump QCoreApplicationPrivate::app_compile_version to 0x050000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/corelib/kernel/qcoreapplication.cpp | 5 ++++- src/widgets/kernel/qwidget.cpp | 8 ++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index f7d1d3d..9408d41 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -176,7 +176,10 @@ CApaCommandLine* QCoreApplicationPrivate::symbianCommandLine() extern QString qAppFileName(); #endif -int QCoreApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly, but it's at least 4.0.0 +#if QT_VERSION >= 0x060000 +# error "Bump QCoreApplicatoinPrivate::app_compile_version to 0x060000" +#endif +int QCoreApplicationPrivate::app_compile_version = 0x050000; //we don't know exactly, but it's at least 5.0.0 #if !defined(Q_OS_WIN) #ifdef Q_OS_MAC diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index c419856..91a4036 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); -- 2.7.4