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/materialsystem/shader_p.h | |
| 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/materialsystem/shader_p.h')
| -rw-r--r-- | src/render/materialsystem/shader_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h index 9b666aa35..88694fd98 100644 --- a/src/render/materialsystem/shader_p.h +++ b/src/render/materialsystem/shader_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QMutex> #include <QVector> #include <Qt3DRender/private/quniformvalue_p.h> #include <Qt3DRender/private/shadervariables_p.h> @@ -59,7 +60,6 @@ QT_BEGIN_NAMESPACE class QOpenGLShaderProgram; -class QMutex; namespace Qt3DRender { @@ -131,7 +131,7 @@ private: bool m_isLoaded; ProgramDNA m_dna; - QMutex *m_mutex; + QMutex m_mutex; void updateDNA(); |