CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qtbase: fix mingw nativesdk build"

Browse Source 
This reverts commit 68bd9cee63.
Proper fix has been merged to qtbase.

Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29
Pick-to: dev
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Samuli Piippo 2022-02-09 18:00:21 +00:00
parent 2394565194
commit 85e55e5629
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
recipes-qt/qt6/qtbase/0001-rhi-d3d11-Try-uuidof-instead-of-IID_-to-help-old-Min.patch
View File

@ -1,25 +0,0 @@
From 91c7e146889f87f3a6a7bf1ab21694b4578cd2db Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
index 54c8b4f477..973dfd2738 100644
--- a/src/gui/rhi/qrhid3d11.cpp
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -214,7 +214,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<void **>(&factory5)))) {
+ if (SUCCEEDED(dxgiFactory->QueryInterface(__uuidof(IDXGIFactory5), reinterpret_cast<void **>(&factory5)))) {
BOOL allowTearing = false;
if (SUCCEEDED(factory5->CheckFeatureSupport(DXGI_FEATURE_PRESENT_ALLOW_TEARING, &allowTearing, sizeof(allowTearing))))
supportsAllowTearing = allowTearing;

1
recipes-qt/qt6/qtbase_git.bb
View File

@ -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 += "\