diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-09 09:21:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-09 09:21:48 +0200 |
| commit | 2eead078c86a4d24403d3d1ba737dbc3096a8b42 (patch) | |
| tree | 58b8da96c63fe4c1e59d3707f0b633592210a82d /src/plugins/styles/windowsvista/qwindowsvistastyle.cpp | |
| parent | 94902905ec203626abc050744d14898674dc2bbd (diff) | |
| parent | 89d0a03c067b42155b1a2d310f8514f595abfd61 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If8e9d88771243fd9e221b49f53d7d8b111a8ce2a
Diffstat (limited to 'src/plugins/styles/windowsvista/qwindowsvistastyle.cpp')
| -rw-r--r-- | src/plugins/styles/windowsvista/qwindowsvistastyle.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index c4ada66ca9..feb2bc824b 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -84,8 +84,7 @@ static const int windowsRightBorder = 15; // right border on windows */ bool QWindowsVistaStylePrivate::useVista() { - return QOperatingSystemVersion::current() >= QOperatingSystemVersion::WindowsVista - && QWindowsVistaStylePrivate::useXP(); + return QWindowsVistaStylePrivate::useXP(); } /* \internal |