diff options
Diffstat (limited to 'src/widgets/dialogs/qwizard.cpp')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 22499b3c22..900a4c1899 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -298,7 +298,7 @@ public: Qt::TextFormat titleFormat, Qt::TextFormat subTitleFormat); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; #if QT_CONFIG(style_windowsvista) private: bool vistaDisabled() const; @@ -454,7 +454,7 @@ public: m_layout->addWidget(m_sideWidget); } - QSize minimumSizeHint() const Q_DECL_OVERRIDE { + QSize minimumSizeHint() const override { if (pixmap() && !pixmap()->isNull()) return pixmap()->size(); return QFrame::minimumSizeHint(); @@ -579,7 +579,7 @@ public: , bottomRuler(0) #if QT_CONFIG(style_windowsvista) , vistaHelper(0) - , vistaInitPending(false) + , vistaInitPending(true) , vistaState(QVistaHelper::Dirty) , vistaStateChanged(false) , inHandleAeroStyleChange(false) @@ -590,12 +590,6 @@ public: , maximumHeight(QWIDGETSIZE_MAX) { std::fill(btns, btns + QWizard::NButtons, static_cast<QAbstractButton *>(0)); - -#if QT_CONFIG(style_windowsvista) - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA - && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) - vistaInitPending = true; -#endif } void init(); |