diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
| commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
| tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /src/render/defaults/qdiffusespecularmapmaterial.cpp | |
| parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
| parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'src/render/defaults/qdiffusespecularmapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index b401239a3..2a24d417d 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -56,10 +56,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -/*! - \class Qt3DRender::QDiffuseSpecularMapMaterialPrivate - \internal -*/ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() : QMaterialPrivate() , m_diffuseSpecularMapEffect(new QEffect()) |