mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-04 16:10:12 +00:00
Add patches as well
This commit is contained in:
parent
df382ff373
commit
b49664d72e
|
|
@ -0,0 +1,29 @@
|
|||
From 92b1583aa9783fc2d2d4bbda6493cc386d199567 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 5 May 2020 13:24:54 +0300
|
||||
Subject: [PATCH] Add forward declaration for QSurface
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
qsgdefaultrendercontext_p.h:101:9: error: ‘QSurface’ does not name a type
|
||||
| QSurface *maybeSurface = nullptr;
|
||||
| ^~~~~~~~
|
||||
|
||||
Change-Id: Ie062ba5ce5bd8071f1a55f3d966649748a707b9f
|
||||
---
|
||||
src/quick/scenegraph/qsgdefaultrendercontext_p.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
|
||||
index cddfe9add2..be83f5a9f5 100644
|
||||
--- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h
|
||||
+++ b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
|
||||
@@ -69,6 +69,7 @@ class QSGMaterialRhiShader;
|
||||
class QOpenGLFramebufferObject;
|
||||
class QSGDepthStencilBufferManager;
|
||||
class QSGDepthStencilBuffer;
|
||||
+class QSurface;
|
||||
|
||||
namespace QSGOpenGLAtlasTexture {
|
||||
class Manager;
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
From 35a285959381d39970fa971669fc965397aa0c46 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 5 May 2020 13:19:24 +0300
|
||||
Subject: [PATCH] Fix build without opengl
|
||||
|
||||
Change-Id: I7857f28f6ce8997dd38119c1d367d8cdbb3cbf37
|
||||
---
|
||||
src/quick/items/qquickrendercontrol.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
|
||||
index eba3ef99a7..b74484832f 100644
|
||||
--- a/src/quick/items/qquickrendercontrol.cpp
|
||||
+++ b/src/quick/items/qquickrendercontrol.cpp
|
||||
@@ -287,7 +287,7 @@ int QQuickRenderControl::samples() const
|
||||
bool QQuickRenderControl::initialize()
|
||||
{
|
||||
Q_D(QQuickRenderControl);
|
||||
-
|
||||
+#if QT_CONFIG(opengl)
|
||||
if (!d->window) {
|
||||
qWarning("QQuickRenderControl::initialize called with no associated window");
|
||||
return false;
|
||||
@@ -311,7 +311,7 @@ bool QQuickRenderControl::initialize()
|
||||
qWarning("QRhi is only compatible with default adaptation");
|
||||
return false;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user