From ef6d533d516eb1e7f49f2e81bd9db58119e9bf52 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu Date: Thu, 11 Jan 2024 20:40:43 +0200 Subject: [PATCH] qt: remove d3d version check in compositor_win7 for Qt 6 --- modules/gui/qt/maininterface/compositor_win7.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/gui/qt/maininterface/compositor_win7.cpp b/modules/gui/qt/maininterface/compositor_win7.cpp index 4a9fc0a522..0a246afda9 100644 --- a/modules/gui/qt/maininterface/compositor_win7.cpp +++ b/modules/gui/qt/maininterface/compositor_win7.cpp @@ -25,8 +25,10 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #define D3D11_NO_HELPERS // avoid tons of warnings #include +#endif #include @@ -55,6 +57,7 @@ CompositorWin7::~CompositorWin7() bool CompositorWin7::preInit(qt_intf_t *p_intf) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) //check whether D3DCompiler is available. whitout it Angle won't work QLibrary d3dCompilerDll; for (int i = 47; i > 41; --i) @@ -94,6 +97,7 @@ bool CompositorWin7::preInit(qt_intf_t *p_intf) msg_Info(p_intf, "no D3D support, use software backend"); QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software); } +#endif return true; }