diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2022-12-06 14:05:54 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2023-01-23 18:53:34 +0100 |
| commit | b2c1237b4512480a17009afe1981af02c2a9869e (patch) | |
| tree | 190b58333b194ced7ae43168f140951311f5bc9a /src/plugins/platforms | |
| parent | 76ecff6aebb35f4e39439aab8d18d828c3c8a1fd (diff) | |
Introduce qt_winrtbase_p.h
Due to a bug in earlier Windows SDKs developers have copy paste
a workaround whenever they are including winrt/base.h. In addition to
that our usage winrt API also forces them to include
qfactorycacheregistration_p.h whenever they include that file. To make
things easier all that magic can now be done with one single include of
qt_winrtbase_p.h.
Pick-to: 6.4
Change-Id: Ic6a80d6d3723af381cf0ecc0f0ab43c2e6839a7d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowstheme.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 6e804c53a0..7535c7a583 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -43,15 +43,8 @@ #include <algorithm> #if QT_CONFIG(cpp_winrt) -# include <winrt/base.h> -# include <QtCore/private/qfactorycacheregistration_p.h> -// Workaround for Windows SDK bug. -// See https://github.com/microsoft/Windows.UI.Composition-Win32-Samples/issues/47 -namespace winrt::impl -{ - template <typename Async> - auto wait_for(Async const& async, Windows::Foundation::TimeSpan const& timeout); -} +# include <QtCore/private/qt_winrtbase_p.h> + # include <winrt/Windows.UI.ViewManagement.h> #endif // QT_CONFIG(cpp_winrt) |