Compare commits

...

2 Commits

Author SHA1 Message Date
Marco Bartoli
1b4cd6f752
Merge d6525e7907 into aabe4f68c7 2024-12-28 10:03:42 +01:00
Marco Bartoli
d6525e7907
Fix build on non-windows 2024-12-15 23:00:30 +01:00

View File

@ -59,7 +59,9 @@
#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
@ -256,8 +258,10 @@ 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)
{ {