From fd6321c03e2d63997078bfa41332dbddefbb86b0 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 5 Apr 2019 09:59:10 +0200
Subject: Remove last traces of QV8Engine

Change-Id: I59f738402d51e39188bbbca2ef1fbc8a61612372
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/quick/scenegraph')

diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 8121b4559e..9ad0a77318 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -41,6 +41,7 @@
 
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qbuffer.h>
+#include <QtCore/qendian.h>
 #include <QtQml/qqmlfile.h>
 
 #include <QtGui/private/qdistancefield_p.h>
-- 
cgit v1.2.3


From 9b36512b9453f429644b0c388d381f7a2fc0f825 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 13 May 2019 17:48:42 +0200
Subject: Avoid illegal downcasts in texture and shader handling

Fixes bad type-cast during destruction when objects no longer has the
full type they used to.

Detected by UBSAN.

Change-Id: I4867091901d70d5a882656834eb97a704def1751
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/scenegraph/qsgcontext.cpp | 2 +-
 src/quick/scenegraph/qsgcontext_p.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/quick/scenegraph')

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index d9ed25c099..53648e352a 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -393,7 +393,7 @@ QSGTexture *QSGRenderContext::textureForFactory(QQuickTextureFactory *factory, Q
 void QSGRenderContext::textureFactoryDestroyed(QObject *o)
 {
     m_mutex.lock();
-    m_texturesToDelete << m_textures.take(static_cast<QQuickTextureFactory *>(o));
+    m_texturesToDelete << m_textures.take(o);
     m_mutex.unlock();
 }
 
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index 6d70d7ef6b..282ce828af 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -194,7 +194,7 @@ protected:
     QPointer<QSGContext> m_sg;
 
     QMutex m_mutex;
-    QHash<QQuickTextureFactory *, QSGTexture *> m_textures;
+    QHash<QObject *, QSGTexture *> m_textures;
     QSet<QSGTexture *> m_texturesToDelete;
     QHash<QString, QSGDistanceFieldGlyphCache *> m_glyphCaches;
 
-- 
cgit v1.2.3


From 0634448056ebbe0dec38ff47b55ed9d4bf9d63da Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Mon, 20 May 2019 16:40:57 +0200
Subject: Add missing #include, needed for use of QLinkedList<>

Change-Id: I9ddc66784f986fe0e9de06a8b05844db90eb6802
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/scenegraph/qsgdefaultglyphnode_p.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/quick/scenegraph')

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
index 37a89c70b9..cfa1c1dad2 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
@@ -53,6 +53,7 @@
 
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qsgbasicglyphnode_p.h>
+#include <qlinkedlist.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3