Use QList instead of QVector in platformsupport

Task-number: QTBUG-84469
Change-Id: I8e4e6626cc840bc9c8bce014c595da9080025dd8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

4 files changed, 10 insertions, 10 deletions

diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
index 5303d37cee..c689836d75 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QVector<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format)
+QList<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format)
 {
     int redSize     = format.redBufferSize();
     int greenSize   = format.greenBufferSize();
@@ -64,7 +64,7 @@ QVector<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format)
     int stencilSize = format.stencilBufferSize();
     int sampleCount = format.samples();
 
-    QVector<EGLint> configAttributes;
+    QList<EGLint> configAttributes;
 
     // Map default, unspecified values (-1) to 0. This is important due to sorting rule #3
     // in section 3.4.1 of the spec and allows picking a potentially faster 16-bit config
@@ -121,7 +121,7 @@ QVector<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format)
     return configAttributes;
 }
 
-bool q_reduceConfigAttributes(QVector<EGLint> *configAttributes)
+bool q_reduceConfigAttributes(QList<EGLint> *configAttributes)
 {
     int i = -1;
     // Reduce the complexity of a configuration request to ask for less
@@ -240,7 +240,7 @@ QEglConfigChooser::~QEglConfigChooser()
 
 EGLConfig QEglConfigChooser::chooseConfig()
 {
-    QVector<EGLint> configureAttributes = q_createConfigAttributesFromFormat(m_format);
+    QList<EGLint> configureAttributes = q_createConfigAttributesFromFormat(m_format);
     configureAttributes.append(EGL_SURFACE_TYPE);
     configureAttributes.append(surfaceType());
 
@@ -299,7 +299,7 @@ EGLConfig QEglConfigChooser::chooseConfig()
         i = configureAttributes.indexOf(EGL_ALPHA_SIZE);
         m_confAttrAlpha = i == -1 ? 0 : configureAttributes.at(i+1);
 
-        QVector<EGLConfig> configs(matching);
+        QList<EGLConfig> configs(matching);
         eglChooseConfig(display(), configureAttributes.constData(), configs.data(), configs.size(), &matching);
         if (!cfg && matching > 0)
             cfg = configs.first();
diff --git a/src/platformsupport/eglconvenience/qeglconvenience_p.h b/src/platformsupport/eglconvenience/qeglconvenience_p.h
index ab2b813515..cdc14be45f 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience_p.h
+++ b/src/platformsupport/eglconvenience/qeglconvenience_p.h
@@ -52,14 +52,14 @@
 //
 
 #include <QtGui/QSurfaceFormat>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QSizeF>
 #include <QtEglSupport/private/qt_egl_p.h>
 
 QT_BEGIN_NAMESPACE
 
-QVector<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format);
-bool q_reduceConfigAttributes(QVector<EGLint> *configAttributes);
+QList<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format);
+bool q_reduceConfigAttributes(QList<EGLint> *configAttributes);
 EGLConfig q_configFromGLFormat(EGLDisplay display, const QSurfaceFormat &format, bool highestPixelFormat = false, int surfaceType = EGL_WINDOW_BIT);
 QSurfaceFormat q_glFormatFromConfig(EGLDisplay display, const EGLConfig config, const QSurfaceFormat &referenceFormat = QSurfaceFormat());
 bool q_hasEglExtension(EGLDisplay display,const char* extensionName);
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index c82473ebbb..7f0c347607 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -126,7 +126,7 @@ QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatform
     // but does not yet contain version, profile, options.
     m_shareContext = share ? static_cast<QEGLPlatformContext *>(share)->m_eglContext : nullptr;
 
-    QVector<EGLint> contextAttrs;
+    QList<EGLint> contextAttrs;
     contextAttrs.append(EGL_CONTEXT_CLIENT_VERSION);
     contextAttrs.append(format.majorVersion());
     const bool hasKHRCreateContext = q_hasEglExtension(m_eglDisplay, "EGL_KHR_create_context");
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
index 610588568e..4a0be36b61 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
@@ -135,7 +135,7 @@ private:
     int m_swapIntervalFromEnv = -1;
     Flags m_flags;
     bool m_ownsContext = false;
-    QVector<EGLint> m_contextAttrs;
+    QList<EGLint> m_contextAttrs;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QEGLPlatformContext::Flags)