From c40d7810c6302eacfe4cedd6bbdc0a552bf49f32 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 Feb 2022 18:00:21 +0000 Subject: [PATCH] Revert "qtbase: fix mingw nativesdk build" This reverts commit 68bd9cee63eaf612c8b650c8b95697e54ac3851b. Proper fix has been merged to qtbase. Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29 Reviewed-by: Jani Heikkinen (cherry picked from commit 85e55e56299911a30e8562407ef81f8f06e31f04) Reviewed-by: Mikko Gronoff --- ...idof-instead-of-IID_-to-help-old-Min.patch | 34 ------------------- recipes-qt/qt6/qtbase_git.bb | 1 - 2 files changed, 35 deletions(-) delete mode 100644 recipes-qt/qt6/qtbase/0001-rhi-d3d11-Try-uuidof-instead-of-IID_-to-help-old-Min.patch diff --git a/recipes-qt/qt6/qtbase/0001-rhi-d3d11-Try-uuidof-instead-of-IID_-to-help-old-Min.patch b/recipes-qt/qt6/qtbase/0001-rhi-d3d11-Try-uuidof-instead-of-IID_-to-help-old-Min.patch deleted file mode 100644 index ed010f0..0000000 --- a/recipes-qt/qt6/qtbase/0001-rhi-d3d11-Try-uuidof-instead-of-IID_-to-help-old-Min.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 965ea251c7640baa9f8706263dbb1f3465c29c75 Mon Sep 17 00:00:00 2001 -From: Laszlo Agocs -Date: Fri, 28 Jan 2022 11:29:16 +0100 -Subject: [PATCH] rhi: d3d11: Try uuidof instead of IID_* to help old MinGW - -Fixes: QTBUG-100294 -Pick-to: 6.3 -Change-Id: Iee90355ecd48a753f9a7ec53e7f5758e3d12eddf ---- - src/gui/rhi/qrhid3d11.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp -index fc6fd59f4f..41f235396e 100644 ---- a/src/gui/rhi/qrhid3d11.cpp -+++ b/src/gui/rhi/qrhid3d11.cpp -@@ -217,7 +217,7 @@ bool QRhiD3D11::create(QRhi::Flags flags) - // sufficient to get non-blocking behavior, try using ALLOW_TEARING - // when available. - IDXGIFactory5 *factory5 = nullptr; -- if (SUCCEEDED(dxgiFactory->QueryInterface(IID_IDXGIFactory5, reinterpret_cast(&factory5)))) { -+ if (SUCCEEDED(dxgiFactory->QueryInterface(__uuidof(IDXGIFactory5), reinterpret_cast(&factory5)))) { - BOOL allowTearing = false; - if (SUCCEEDED(factory5->CheckFeatureSupport(DXGI_FEATURE_PRESENT_ALLOW_TEARING, &allowTearing, sizeof(allowTearing)))) - supportsAllowTearing = allowTearing; -@@ -4667,7 +4667,7 @@ bool QD3D11SwapChain::createOrResize() - swapChain = sc1; - if (m_format != SDR) { - IDXGISwapChain3 *sc3 = nullptr; -- if (SUCCEEDED(sc1->QueryInterface(IID_IDXGISwapChain3, reinterpret_cast(&sc3)))) { -+ if (SUCCEEDED(sc1->QueryInterface(__uuidof(IDXGISwapChain3), reinterpret_cast(&sc3)))) { - hr = sc3->SetColorSpace1(hdrColorSpace); - if (FAILED(hr)) - qWarning("Failed to set color space on swapchain: %s", qPrintable(comErrorMessage(hr))); diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 6160dc3..3a382e6 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -18,7 +18,6 @@ SRC_URI += "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-tests-disable-failing-tests.patch \ file://0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch \ - file://0001-rhi-d3d11-Try-uuidof-instead-of-IID_-to-help-old-Min.patch \ " DEPENDS += "\