diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-06-02 16:55:26 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-06-02 16:08:58 +0000 |
| commit | 878baeda2b1f9da688f81d1d3aa2e7ab0dd3eb24 (patch) | |
| tree | 2146b65a6d92af17c8f541db7074d8099e08267a /src/quick/items/qquickgraphicsinfo_p.h | |
| parent | a48ca7e319bb7ad95a31638b2493560a58a4b8a3 (diff) | |
Add OpenGL prefixes to ContextProfile in GraphicsInfo
Make it clear with the naming that this is specific to OpenGL.
Change-Id: Ib2106c1539ee424a0d208d17c684c3bb9ad28fa9
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/quick/items/qquickgraphicsinfo_p.h')
| -rw-r--r-- | src/quick/items/qquickgraphicsinfo_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/items/qquickgraphicsinfo_p.h b/src/quick/items/qquickgraphicsinfo_p.h index 0cbfbbddba..9ef7bacb3e 100644 --- a/src/quick/items/qquickgraphicsinfo_p.h +++ b/src/quick/items/qquickgraphicsinfo_p.h @@ -72,7 +72,7 @@ class QQuickGraphicsInfo : public QObject Q_PROPERTY(int majorVersion READ majorVersion NOTIFY majorVersionChanged FINAL) Q_PROPERTY(int minorVersion READ minorVersion NOTIFY minorVersionChanged FINAL) - Q_PROPERTY(ContextProfile profile READ profile NOTIFY profileChanged FINAL) + Q_PROPERTY(OpenGLContextProfile profile READ profile NOTIFY profileChanged FINAL) Q_PROPERTY(RenderableType renderableType READ renderableType NOTIFY renderableTypeChanged FINAL) public: @@ -104,12 +104,12 @@ public: }; Q_ENUM(ShaderSourceType) - enum ContextProfile { - NoProfile = QSurfaceFormat::NoProfile, - CoreProfile = QSurfaceFormat::CoreProfile, - CompatibilityProfile = QSurfaceFormat::CompatibilityProfile + enum OpenGLContextProfile { + OpenGLNoProfile = QSurfaceFormat::NoProfile, + OpenGLCoreProfile = QSurfaceFormat::CoreProfile, + OpenGLCompatibilityProfile = QSurfaceFormat::CompatibilityProfile }; - Q_ENUM(ContextProfile) + Q_ENUM(OpenGLContextProfile) enum RenderableType { SurfaceFormatUnspecified = QSurfaceFormat::DefaultRenderableType, @@ -129,7 +129,7 @@ public: int majorVersion() const { return m_majorVersion; } int minorVersion() const { return m_minorVersion; } - ContextProfile profile() const { return m_profile; } + OpenGLContextProfile profile() const { return m_profile; } RenderableType renderableType() const { return m_renderableType; } Q_SIGNALS: @@ -155,7 +155,7 @@ private: ShaderSourceType m_shaderSourceType; int m_majorVersion; int m_minorVersion; - ContextProfile m_profile; + OpenGLContextProfile m_profile; RenderableType m_renderableType; }; |