aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickgraphicsinfo.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2016-06-02 16:55:26 +0200
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2016-06-02 16:08:58 +0000
commit878baeda2b1f9da688f81d1d3aa2e7ab0dd3eb24 (patch)
tree2146b65a6d92af17c8f541db7074d8099e08267a /src/quick/items/qquickgraphicsinfo.cpp
parenta48ca7e319bb7ad95a31638b2493560a58a4b8a3 (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.cpp')
-rw-r--r--src/quick/items/qquickgraphicsinfo.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickgraphicsinfo.cpp b/src/quick/items/qquickgraphicsinfo.cpp
index 2dbad82acf..79b0edf031 100644
--- a/src/quick/items/qquickgraphicsinfo.cpp
+++ b/src/quick/items/qquickgraphicsinfo.cpp
@@ -70,7 +70,7 @@ QQuickGraphicsInfo::QQuickGraphicsInfo(QQuickItem *item)
, m_shaderSourceType(ShaderSourceType(0))
, m_majorVersion(2)
, m_minorVersion(0)
- , m_profile(NoProfile)
+ , m_profile(OpenGLNoProfile)
, m_renderableType(SurfaceFormatUnspecified)
{
connect(item, SIGNAL(windowChanged(QQuickWindow*)), this, SLOT(setWindow(QQuickWindow*)));
@@ -211,9 +211,9 @@ QQuickGraphicsInfo *QQuickGraphicsInfo::qmlAttachedProperties(QObject *object)
The possible values are:
\list
- \li GraphicsInfo.NoProfile (default) - OpenGL version is lower than 3.2 or OpenGL is not in use.
- \li GraphicsInfo.CoreProfile - Functionality deprecated in OpenGL version 3.0 is not available.
- \li GraphicsInfo.CompatibilityProfile - Functionality from earlier OpenGL versions is available.
+ \li GraphicsInfo.OpenGLNoProfile (default) - OpenGL version is lower than 3.2 or OpenGL is not in use.
+ \li GraphicsInfo.OpenGLCoreProfile - Functionality deprecated in OpenGL version 3.0 is not available.
+ \li GraphicsInfo.OpenGLCompatibilityProfile - Functionality from earlier OpenGL versions is available.
\endlist
Reusable QML components will typically use this property in bindings in order to
@@ -275,7 +275,7 @@ void QQuickGraphicsInfo::updateInfo()
m_minorVersion = format.minorVersion();
emit minorVersionChanged();
}
- ContextProfile profile = static_cast<ContextProfile>(format.profile());
+ OpenGLContextProfile profile = static_cast<OpenGLContextProfile>(format.profile());
if (m_profile != profile) {
m_profile = profile;
emit profileChanged();