diff options
Diffstat (limited to 'src/plugins/platforms/openkode')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/openkode/qopenkodeintegration.cpp b/src/plugins/platforms/openkode/qopenkodeintegration.cpp index 89475db54b..38c4325bb4 100644 --- a/src/plugins/platforms/openkode/qopenkodeintegration.cpp +++ b/src/plugins/platforms/openkode/qopenkodeintegration.cpp @@ -43,7 +43,7 @@ #include "qopenkodewindow.h" #include "qopenkodeeventloopintegration.h" -#include <QtOpenGL/private/qpixmapdata_gl_p.h> +#include <QtOpenGL/qplatformpixmap_gl_p.h> #include <QtOpenGL/private/qwindowsurface_gl_p.h> #include <QtGui/private/qpixmap_raster_p.h> @@ -197,9 +197,9 @@ bool QOpenKODEIntegration::hasCapability(QPlatformIntegration::Capability cap) c } } -QPixmapData *QOpenKODEIntegration::createPixmapData(QPixmapData::PixelType type) const +QPlatformPixmap *QOpenKODEIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const { - return new QGLPixmapData(type); + return new QGLPlatformPixmap(type); } QPlatformWindow *QOpenKODEIntegration::createPlatformWindow(QWidget *tlw, WId ) const diff --git a/src/plugins/platforms/openkode/qopenkodeintegration.h b/src/plugins/platforms/openkode/qopenkodeintegration.h index 0f001c957b..43961add6d 100644 --- a/src/plugins/platforms/openkode/qopenkodeintegration.h +++ b/src/plugins/platforms/openkode/qopenkodeintegration.h @@ -48,7 +48,7 @@ #include <QtGui/QPlatformIntegration> #include <QtGui/QPlatformScreen> -#include <QtGui/QPlatformGLContext> +#include <QtGui/QPlatformOpenGLContext> #include <QtGui/QPlatformFontDatabase> #include <GLES2/gl2.h> @@ -92,7 +92,7 @@ public: bool hasCapability(QPlatformIntegration::Capability cap) const; - QPixmapData *createPixmapData(QPixmapData::PixelType type) const; + QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId = 0) const; QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const; diff --git a/src/plugins/platforms/openkode/qopenkodewindow.cpp b/src/plugins/platforms/openkode/qopenkodewindow.cpp index c6fe6d0176..e20904470f 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.cpp +++ b/src/plugins/platforms/openkode/qopenkodewindow.cpp @@ -53,7 +53,7 @@ #include <EGL/egl.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/private/qwidget_p.h> #include <QtGui/private/qapplication_p.h> @@ -235,7 +235,7 @@ WId QOpenKODEWindow::winId() const return i++; } -QPlatformGLContext *QOpenKODEWindow::glContext() const +QPlatformOpenGLContext *QOpenKODEWindow::glContext() const { return m_platformGlContext; } diff --git a/src/plugins/platforms/openkode/qopenkodewindow.h b/src/plugins/platforms/openkode/qopenkodewindow.h index 317a6b5cd6..f48c3a2bc0 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.h +++ b/src/plugins/platforms/openkode/qopenkodewindow.h @@ -63,7 +63,7 @@ public: void setVisible(bool visible); WId winId() const; - QPlatformGLContext *glContext() const; + QPlatformOpenGLContext *glContext() const; void raise(); void lower(); |