diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 01:00:59 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-15 10:14:05 +0100 |
commit | d14fd32d403bd8d120fbe92dae06e9cb187c01c8 (patch) | |
tree | fbcae21f765b48e0359f9fb303554172caa5a83c /src/plugins/styles/windowsvista | |
parent | 96dea48c154e5971593582f92917db3b3f17c7fa (diff) | |
parent | 2cbc5f6f7ae8ba580126a7cafc1898377c2a2407 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/network/access/spdy/tst_spdy.cpp
Change-Id: I3196c5f7b34f2ffc9ef1e690d02d5b9bb3270a74
Diffstat (limited to 'src/plugins/styles/windowsvista')
-rw-r--r-- | src/plugins/styles/windowsvista/qwindowsxpstyle.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp index bf80138b32..5d2e8efd68 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp @@ -3774,8 +3774,7 @@ int QWindowsXPStyle::styleHint(StyleHint hint, const QStyleOption *option, const /*! \reimp */ QPalette QWindowsXPStyle::standardPalette() const { - return QWindowsXPStylePrivate::useXP() && QApplicationPrivate::sys_pal - ? *QApplicationPrivate::sys_pal : QWindowsStyle::standardPalette(); + return QWindowsXPStylePrivate::useXP() ? QPalette() : QWindowsStyle::standardPalette(); } /*! |