diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-02 11:38:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-13 08:13:14 +0000 |
| commit | c19ab81d5547079c8dc28824071562d256637621 (patch) | |
| tree | 370c6df1df4790d8831bb5b3e3a6f8f534024d5d /src/render/frontend/qshaderprogram.h | |
| parent | 3bef2c0ca1b7e3fee0adfaf2b53fb11d287c3d55 (diff) | |
Port from Q_ENUMS to new macro Q_ENUM.
Remove Q_ENUMS in favor of the new Q_ENUM macro which provides
registration as meta enum and a debug stream operator.
Change-Id: I39c61af189daebe2bf0c7474202da9f6110441c5
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qshaderprogram.h')
| -rw-r--r-- | src/render/frontend/qshaderprogram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/frontend/qshaderprogram.h b/src/render/frontend/qshaderprogram.h index 135668836..4023980a8 100644 --- a/src/render/frontend/qshaderprogram.h +++ b/src/render/frontend/qshaderprogram.h @@ -55,7 +55,6 @@ class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QNode Q_PROPERTY(QByteArray geometryShaderCode READ geometryShaderCode WRITE setGeometryShaderCode NOTIFY geometryShaderCodeChanged) Q_PROPERTY(QByteArray fragmentShaderCode READ fragmentShaderCode WRITE setFragmentShaderCode NOTIFY fragmentShaderCodeChanged) Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged) - Q_ENUMS(ShaderType) public: explicit QShaderProgram(QNode *parent = 0); @@ -68,6 +67,7 @@ public: Geometry, Compute }; + Q_ENUM(ShaderType) // Source code in-line void setVertexShaderCode(const QByteArray &vertexShaderCode); |