Enum Profile renamed to OpenGLProfile

Task-number: QTBUG-51465
Change-Id: I86831122ed8aab9fcb0b00d3e850be58e74bd0de
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 11 insertions, 13 deletions

diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index daa1d1e02..2064142d9 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -640,7 +640,7 @@ GraphicsHelperInterface *GraphicsContext::resolveHighestOpenGLFunctions()
     m_contextInfo->setMajorVersion(m_gl->format().version().first);
     m_contextInfo->setMinorVersion(m_gl->format().version().second);
     m_contextInfo->setApi(m_gl->isOpenGLES() ? QGraphicsApiFilter::OpenGLES : QGraphicsApiFilter::OpenGL);
-    m_contextInfo->setProfile(static_cast<QGraphicsApiFilter::Profile>(m_gl->format().profile()));
+    m_contextInfo->setProfile(static_cast<QGraphicsApiFilter::OpenGLProfile>(m_gl->format().profile()));
     m_contextInfo->setExtensions(extensions);
     m_contextInfo->setVendor(QString::fromUtf8(reinterpret_cast<const char *>(m_gl->functions()->glGetString(GL_VENDOR))));
 
diff --git a/src/render/materialsystem/qgraphicsapifilter.cpp b/src/render/materialsystem/qgraphicsapifilter.cpp
index e9cebfac4..cb25b8628 100644
--- a/src/render/materialsystem/qgraphicsapifilter.cpp
+++ b/src/render/materialsystem/qgraphicsapifilter.cpp
@@ -59,7 +59,7 @@ public:
 
     Q_DECLARE_PUBLIC(QGraphicsApiFilter)
     QGraphicsApiFilter::Api m_api;
-    QGraphicsApiFilter::Profile m_profile;
+    QGraphicsApiFilter::OpenGLProfile m_profile;
     int m_minor;
     int m_major;
     QStringList m_extensions;
@@ -153,7 +153,7 @@ QGraphicsApiFilter::Api QGraphicsApiFilter::api() const
   \value CompatibilityProfile QSurfaceFormat::CompatibilityProfile
 */
 
-QGraphicsApiFilter::Profile QGraphicsApiFilter::profile() const
+QGraphicsApiFilter::OpenGLProfile QGraphicsApiFilter::profile() const
 {
     Q_D(const QGraphicsApiFilter);
     return d->m_profile;
@@ -233,7 +233,7 @@ void QGraphicsApiFilter::setApi(QGraphicsApiFilter::Api api)
     }
 }
 
-void QGraphicsApiFilter::setProfile(QGraphicsApiFilter::Profile profile)
+void QGraphicsApiFilter::setProfile(QGraphicsApiFilter::OpenGLProfile profile)
 {
     Q_D(QGraphicsApiFilter);
     if (d->m_profile != profile) {
diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h
index ddd57cef9..c97269540 100644
--- a/src/render/materialsystem/qgraphicsapifilter.h
+++ b/src/render/materialsystem/qgraphicsapifilter.h
@@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QGraphicsApiFilter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QGraphicsApiFilter::Api api READ api WRITE setApi NOTIFY apiChanged)
-    Q_PROPERTY(Qt3DRender::QGraphicsApiFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged)
+    Q_PROPERTY(Qt3DRender::QGraphicsApiFilter::OpenGLProfile profile READ profile WRITE setProfile NOTIFY profileChanged)
     Q_PROPERTY(int minorVersion READ minorVersion WRITE setMinorVersion NOTIFY minorVersionChanged)
     Q_PROPERTY(int majorVersion READ majorVersion WRITE setMajorVersion NOTIFY majorVersionChanged)
     Q_PROPERTY(QStringList extensions READ extensions WRITE setExtensions NOTIFY extensionsChanged)
@@ -63,27 +63,25 @@ class QT3DRENDERSHARED_EXPORT QGraphicsApiFilter : public QObject
 
 public:
 
-    enum Api
-    {
+    enum Api {
         OpenGLES = QSurfaceFormat::OpenGLES,
         OpenGL = QSurfaceFormat::OpenGL
     };
     Q_ENUM(Api)
 
-    enum Profile
-    {
+    enum OpenGLProfile {
         NoProfile = QSurfaceFormat::NoProfile,
         CoreProfile = QSurfaceFormat::CoreProfile,
         CompatibilityProfile = QSurfaceFormat::CompatibilityProfile
     };
-    Q_ENUM(Profile)
+    Q_ENUM(OpenGLProfile)
 
     explicit QGraphicsApiFilter(QObject *parent = 0);
 
     void copy(const QGraphicsApiFilter &ref);
 
     Api api() const;
-    Profile profile() const;
+    OpenGLProfile profile() const;
     int minorVersion() const;
     int majorVersion() const;
     QStringList extensions() const;
@@ -91,7 +89,7 @@ public:
 
 public Q_SLOTS:
     void setApi(Api api);
-    void setProfile(Profile profile);
+    void setProfile(OpenGLProfile profile);
     void setMinorVersion(int minorVersion);
     void setMajorVersion(int majorVersion);
     void setExtensions(const QStringList &extensions);
@@ -99,7 +97,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void apiChanged(Api api);
-    void profileChanged(Profile profile);
+    void profileChanged(OpenGLProfile profile);
     void minorVersionChanged(int minorVersion);
     void majorVersionChanged(int majorVersion);
     void extensionsChanged(const QStringList &extensions);