From e95afda04d0f7762a31c853829952b4bc1048e38 Mon Sep 17 00:00:00 2001
From: Pasi Keranen <pasi.keranen@digia.com>
Date: Thu, 26 Mar 2015 09:00:28 +0200
Subject: [PATCH] Fixes compile issues with mingw.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Original idea to generate unique id's for texture images from class pointer
doesn't compile on mingw, switching to generate the id with a simple
incremental uint value.
Change-Id: Ife3b268103bb28d1ab7722f8d312480e3b79391e
Task-number: QTBUG-45161
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
src/imports/qtcanvas3d/teximage3d.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/imports/qtcanvas3d/teximage3d.cpp b/src/imports/qtcanvas3d/teximage3d.cpp
index 04c6c19..2074870 100644
--- a/src/imports/qtcanvas3d/teximage3d.cpp
+++ b/src/imports/qtcanvas3d/teximage3d.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
QT_CANVAS3D_BEGIN_NAMESPACE
static QMap<QQmlEngine *,CanvasTextureImageFactory *>m_qmlEngineToImageFactoryMap;
+static ulong m_texId = 0;
class StaticFactoryMapDeleter
{
@@ -260,7 +261,7 @@ void CanvasTextureImage::setSrc(const QUrl &url)
*/
ulong CanvasTextureImage::id()
{
- return ulong(this);
+ return m_texId++;
}
/*!
--
GitLab