summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qshaderprogram_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2017-02-15 10:36:48 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-16 10:29:35 +0000
commit4908bb231e32ecf0673f9f2dfa651e23fb3d325f (patch)
tree5e722b5da6069cbf47b452096151e26be3c6eb95 /src/render/materialsystem/qshaderprogram_p.h
parentec787715a7cb7af5a34972356009642da45e2950 (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/qshaderprogram_p.h')
-rw-r--r--src/render/materialsystem/qshaderprogram_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/qshaderprogram_p.h b/src/render/materialsystem/qshaderprogram_p.h
index 171cd8724..6bdde68f1 100644
--- a/src/render/materialsystem/qshaderprogram_p.h
+++ b/src/render/materialsystem/qshaderprogram_p.h
@@ -77,10 +77,10 @@ public:
QByteArray m_fragmentShaderCode;
QByteArray m_computeShaderCode;
QString m_log;
- QShaderProgram::ShaderStatus m_status;
+ QShaderProgram::Status m_status;
void setLog(const QString &log);
- void setStatus(QShaderProgram::ShaderStatus status);
+ void setStatus(QShaderProgram::Status status);
};
struct QShaderProgramData