Commit e95afda0 authored by Pasi Keranen's avatar Pasi Keranen Committed by Pasi Keränen
Browse files

Fixes compile issues with mingw.


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: default avatarPasi Keränen <pasi.keranen@digia.com>
Showing with 2 additions and 1 deletion
......@@ -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++;
}
/*!
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment