diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:25 +0100 |
| commit | d367ac81d5ef77f02434274524477dc0e5c2b4a4 (patch) | |
| tree | 3496a86e26e861087973bd5c2fe57805247e6b05 /src | |
| parent | b351fb164af327828c9bdbc414ffd8e47e387e8c (diff) | |
| parent | 5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I82a8b6d273391f76bcf861c2cac2c348f676f4a2
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf | 12 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/teximage3d.cpp | 5 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/teximage3d_p.h | 3 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf index be8e805..c0a7ae4 100644 --- a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf +++ b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf @@ -1,8 +1,8 @@ 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 diff --git a/src/imports/qtcanvas3d/teximage3d.cpp b/src/imports/qtcanvas3d/teximage3d.cpp index 652e8c2..8528d15 100644 --- a/src/imports/qtcanvas3d/teximage3d.cpp +++ b/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); diff --git a/src/imports/qtcanvas3d/teximage3d_p.h b/src/imports/qtcanvas3d/teximage3d_p.h index 6789a2e..59bd0d6 100644 --- a/src/imports/qtcanvas3d/teximage3d_p.h +++ b/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 |