diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2017-02-15 10:36:48 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-16 10:29:35 +0000 |
commit | 4908bb231e32ecf0673f9f2dfa651e23fb3d325f (patch) | |
tree | 5e722b5da6069cbf47b452096151e26be3c6eb95 /src/render/materialsystem/shader_p.h | |
parent | ec787715a7cb7af5a34972356009642da45e2950 (diff) |
QShaderProgram: rename enum ShaderStatus to Status
Task-number: QTBUG-58896
Change-Id: I39be12a9fe00d3fd2e2f6074dd7f8df728ac1b7a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/shader_p.h')
-rw-r--r-- | src/render/materialsystem/shader_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h index 625abe847..b5127f5ec 100644 --- a/src/render/materialsystem/shader_p.h +++ b/src/render/materialsystem/shader_p.h @@ -119,7 +119,7 @@ public: ShaderStorageBlock storageBlockForBlockName(const QString &blockName); inline QString log() const { return m_log; } - inline QShaderProgram::ShaderStatus status() const { return m_status; } + inline QShaderProgram::Status status() const { return m_status; } void submitPendingNotifications(); inline bool hasPendingNotifications() const { return !m_pendingNotifications.empty(); } @@ -155,7 +155,7 @@ private: GraphicsContext *m_graphicsContext; QMetaObject::Connection m_contextConnection; QString m_log; - QShaderProgram::ShaderStatus m_status; + QShaderProgram::Status m_status; QVector<Qt3DCore::QPropertyUpdatedChangePtr> m_pendingNotifications; @@ -169,7 +169,7 @@ private: void initializeFromReference(const Shader &other); void setLog(const QString &log); - void setStatus(QShaderProgram::ShaderStatus status); + void setStatus(QShaderProgram::Status status); friend class GraphicsContext; }; |