Say hello to Q_WS_QPA!

Rename Q_WS_LITE -> Q_WS_QPA

5 files changed, 15 insertions, 15 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index a43f1d4..1241b7a 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -96,7 +96,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_LITE)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
 QGLExtensionFuncs QGLContextPrivate::qt_extensionFuncs;
 #endif
 
@@ -1393,7 +1393,7 @@ QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags()
         }
     }
 
-#ifdef Q_WS_LITE
+#ifdef Q_WS_QPA
     hasOpenGL(); // ### I have no idea why this is needed here, but it makes things work for testlite
 #endif
 
@@ -1642,7 +1642,7 @@ void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format)
 #  endif
     vi = 0;
 #endif
-#if defined(Q_WS_LITE)
+#if defined(Q_WS_QPA)
     platformContext = 0;
 #endif
 #if !defined(QT_NO_EGL)
@@ -4049,7 +4049,7 @@ void QGLWidget::resizeOverlayGL(int, int)
 /*! \fn bool QGLWidget::event(QEvent *e)
   \reimp
 */
-#if !defined(Q_OS_WINCE) && !defined(Q_WS_QWS) && !defined(Q_WS_LITE)
+#if !defined(Q_OS_WINCE) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA)
 bool QGLWidget::event(QEvent *e)
 {
     Q_D(QGLWidget);
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index a1be68f..6c1e6aa 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -68,7 +68,7 @@
 #include <QtGui/private/qegl_p.h>
 #endif
 
-#if defined(Q_WS_LITE)
+#if defined(Q_WS_QPA)
 #include <QtGui/QPlatformGLContext>
 #endif
 
@@ -359,7 +359,7 @@ public:
     EGLSurface eglSurfaceForDevice() const;
 #endif
 
-#if defined(Q_WS_LITE)
+#if defined(Q_WS_QPA)
     QPlatformGLContext *platformContext;
 #elif defined(Q_WS_X11) || defined(Q_WS_MAC)
     void* cx;
@@ -424,7 +424,7 @@ public:
     static inline QGLExtensionFuncs& extensionFuncs(const QGLContext *ctx) { return ctx->d_ptr->group->extensionFuncs(); }
 #endif
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_LITE)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
     static QGLExtensionFuncs qt_extensionFuncs;
     static inline QGLExtensionFuncs& extensionFuncs(const QGLContext *) { return qt_extensionFuncs; }
 #endif
diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
index a7f4159..69678d0 100644
--- a/src/opengl/qglpixelbuffer_p.h
+++ b/src/opengl/qglpixelbuffer_p.h
@@ -197,10 +197,10 @@ public:
     EGLSurface pbuf;
     QEglContext *ctx;
     int textureFormat;
-#elif defined(Q_WS_LITE)
-    // Stubs
-    int pbuf;
-    int ctx;
+#elif defined(Q_WS_QPA)
+    //stubs
+    void *pbuf;
+    void *ctx;
 #endif
 };
 
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 98455e1..b7629c6 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -419,7 +419,7 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &
     QWidget *parent = widget->internalWinId() ? widget : widget->nativeParentWidget();
     Q_ASSERT(parent);
 
-#if !defined(Q_WS_LITE)
+#if !defined(Q_WS_QPA)
     if (!geometry().isValid())
         return;
 #else
@@ -648,7 +648,7 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &
 }
 
 
-#if !defined(Q_WS_LITE)
+#if !defined(Q_WS_QPA)
 void QGLWindowSurface::setGeometry(const QRect &rect)
 {
     QWindowSurface::setGeometry(rect);
@@ -667,7 +667,7 @@ void QGLWindowSurface::updateGeometry() {
         return;
     d_ptr->geometry_updated = false;
 
-#ifdef Q_WS_LITE
+#ifdef Q_WS_QPA
     QSize surfSize = size();
 #else
     QSize surfSize = geometry().size();
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h
index 6bff109..10c8658 100644
--- a/src/opengl/qwindowsurface_gl_p.h
+++ b/src/opengl/qwindowsurface_gl_p.h
@@ -87,7 +87,7 @@ public:
     QPaintDevice *paintDevice();
     void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
 
-#if !defined(Q_WS_LITE)
+#if !defined(Q_WS_QPA)
     void setGeometry(const QRect &rect);
 #else
     virtual void resize(const QSize &size);