Merge remote-tracking branch 'origin/5.6.0' into 5.6

Change-Id: I82a8b6d273391f76bcf861c2cac2c348f676f4a2

src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf

 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project             = QtCanvas3D
-description         = QtCanvas3D Reference Documentation
-version             = 1.1.0
+description         = Qt Canvas 3D Reference Documentation
+version             = $QT_VERSION
 
 exampledirs = ../../../../examples/canvas3d \
               snippets
@@ -18,15 +18,15 @@ depends     = qtcore qtgui qtqml qtquick qtquickcontrols qtquicklayouts qtdoc qt
 qhp.projects                   = QtCanvas3D
 
 qhp.QtCanvas3D.file            = qtcanvas3d.qhp
-qhp.QtCanvas3D.namespace       = org.qt-project.qtcanvas3d.100
+qhp.QtCanvas3D.namespace       = org.qt-project.qtcanvas3d.$QT_VERSION_TAG
 qhp.QtCanvas3D.virtualFolder   = qtcanvas3d
 qhp.QtCanvas3D.indexTitle      = Qt Canvas 3D
 qhp.QtCanvas3D.indexRoot       =
 
 
-qhp.QtCanvas3D.filterAttributes                        = qtcanvas3d 1.1.0 qtrefdoc
-qhp.QtCanvas3D.customFilters.Qt.name                   = QtCanvas3D 1.1.0
-qhp.QtCanvas3D.customFilters.Qt.filterAttributes       = qtcanvas3d 1.1.0
+qhp.QtCanvas3D.filterAttributes                        = qtcanvas3d $QT_VERSION qtrefdoc
+qhp.QtCanvas3D.customFilters.Qt.name                   = QtCanvas3D $QT_VERSION
+qhp.QtCanvas3D.customFilters.Qt.filterAttributes       = qtcanvas3d $QT_VERSION
 qhp.QtCanvas3D.subprojects                             = gettingstarted examples types
 qhp.QtCanvas3D.subprojects.gettingstarted.title        = Getting Started
 qhp.QtCanvas3D.subprojects.gettingstarted.indexTitle   = Qt Canvas 3D Getting Started

src/imports/qtcanvas3d/teximage3d.cpp

@@ -198,7 +198,7 @@ void CanvasTextureImage::cleanupNetworkReply()
 
 CanvasTextureImage::~CanvasTextureImage()
 {
-    if (m_parentFactory)
+    if (!m_parentFactory.isNull())
         m_parentFactory->handleImageDestroyed(this);
     cleanupNetworkReply();
     delete[] m_pixelCache;
@@ -257,7 +257,8 @@ void CanvasTextureImage::load()
         return;
 
     setImageState(LOADING);
-    m_parentFactory->handleImageLoadingStarted(this);
+    if (!m_parentFactory.isNull())
+        m_parentFactory->handleImageLoadingStarted(this);
     emit imageLoadingStarted(this);
 
     QNetworkRequest request(m_source);

src/imports/qtcanvas3d/teximage3d_p.h

@@ -51,6 +51,7 @@
 #include "abstractobject3d_p.h"
 
 #include <QtCore/QUrl>
+#include <QtCore/QPointer>
 #include <QtGui/QImage>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
@@ -159,7 +160,7 @@ private:
     bool m_pixelCacheFlipY;
     QImage m_glImage;
     QVariant *m_anyValue;
-    CanvasTextureImageFactory *m_parentFactory;
+    QPointer<CanvasTextureImageFactory> m_parentFactory;
 };
 
 QT_CANVAS3D_END_NAMESPACE