diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 11:57:52 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-29 12:36:15 +0000 |
commit | 7c7595e1b298a1666056c03f042ec7a4a0aedafe (patch) | |
tree | 3c1737b59a64813d6428ca979d10d4c7ff4cc932 /src | |
parent | 0eb2e1f38f1683a4bab5f5cb60dd411a1e6f3aa2 (diff) | |
download | qtbase-7c7595e1b298a1666056c03f042ec7a4a0aedafe.tar.gz |
QWizard/Windows: Remove code for Windows < 7
Change-Id: I1021ede67fe1396cdea3114d310e293fad2bcd76
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 8 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard_win.cpp | 5 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard_win_p.h | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 8b90028fbb..900a4c1899 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -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(); diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 666b192e9c..6ca4541980 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -154,10 +154,7 @@ QVistaHelper::QVistaHelper(QWizard *wizard) backButton_ = new QVistaBackButton(wizard); backButton_->hide(); - // Handle diff between Windows 7 and Vista iconSpacing = QStyleHelper::dpiScaled(7); - textSpacing = QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? - iconSpacing : QStyleHelper::dpiScaled(20); } QVistaHelper::~QVistaHelper() @@ -695,7 +692,7 @@ int QVistaHelper::captionSizeDp() int QVistaHelper::titleOffset() { - int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + textSpacing; + int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + iconSpacing; return leftMargin() + iconOffset; } diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index f9122865c2..7ca4899a1f 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -104,8 +104,7 @@ public: static int titleBarSize() { return QVistaHelper::titleBarSizeDp() / QVistaHelper::m_devicePixelRatio; } static int titleBarSizeDp() { return QVistaHelper::frameSizeDp() + QVistaHelper::captionSizeDp(); } static int topPadding() { // padding under text - return int(QStyleHelper::dpiScaled( - QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? 4 : 6)); + return int(QStyleHelper::dpiScaled(4)); } static int topOffset(); @@ -150,7 +149,6 @@ private: int titleBarOffset; // Extra spacing above the text int iconSpacing; // Space between button and icon - int textSpacing; // Space between icon and text static int m_devicePixelRatio; }; |