Compare commits

..

No commits in common. "e92ba4dce46f786e4da384a0604188e39b1ad7ca" and "50a1a7f6e945ce6678d1c47833b0a4c47bb8acd3" have entirely different histories.

View File

@ -59,9 +59,7 @@
#include <algorithm> #include <algorithm>
#if defined(Q_OS_WIN)
#include "../../plugins/platforms/windows/vxkex.h" #include "../../plugins/platforms/windows/vxkex.h"
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -258,10 +256,8 @@ void QWindowsStyle::polish(QPalette &pal)
QCommonStyle::polish(pal); QCommonStyle::polish(pal);
} }
#if defined(Q_OS_WIN)
typedef BOOL (WINAPI *GetSystemMetricsForDpiFunc)(int, UINT); typedef BOOL (WINAPI *GetSystemMetricsForDpiFunc)(int, UINT);
typedef BOOL (WINAPI *SystemParametersInfoForDpiFunc)(UINT, UINT, PVOID, UINT, UINT); typedef BOOL (WINAPI *SystemParametersInfoForDpiFunc)(UINT, UINT, PVOID, UINT, UINT);
#endif
int QWindowsStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *, const QWidget *widget) int QWindowsStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *, const QWidget *widget)
{ {