5 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/platforms/uikit/quikitintegration.h b/src/plugins/platforms/uikit/quikitintegration.h
index 92247fdff3..b8a15b3807 100644
--- a/src/plugins/platforms/uikit/quikitintegration.h
+++ b/src/plugins/platforms/uikit/quikitintegration.h
@@ -52,7 +52,7 @@ public:
     QUIKitIntegration();
     ~QUIKitIntegration();
 
-    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/uikit/quikitintegration.mm b/src/plugins/platforms/uikit/quikitintegration.mm
index 737fa40d05..37ba2b9a02 100644
--- a/src/plugins/platforms/uikit/quikitintegration.mm
+++ b/src/plugins/platforms/uikit/quikitintegration.mm
@@ -64,9 +64,9 @@ QUIKitIntegration::~QUIKitIntegration()
 {
 }
 
-QPixmapData *QUIKitIntegration::createPixmapData(QPixmapData::PixelType type) const
+QPlatformPixmap *QUIKitIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const
 {
-    return new QRasterPixmapData(type);
+    return new QRasterPlatformPixmap(type);
 }
 
 QPlatformWindow *QUIKitIntegration::createPlatformWindow(QWidget *widget, WId winId) const
diff --git a/src/plugins/platforms/uikit/quikitwindow.h b/src/plugins/platforms/uikit/quikitwindow.h
index c482dae3d5..67f0242a48 100644
--- a/src/plugins/platforms/uikit/quikitwindow.h
+++ b/src/plugins/platforms/uikit/quikitwindow.h
@@ -117,7 +117,7 @@ public:
 
     UIWindow *ensureNativeWindow();
 
-    QPlatformGLContext *glContext() const;
+    QPlatformOpenGLContext *glContext() const;
 
 private:
     QUIKitScreen *mScreen;
diff --git a/src/plugins/platforms/uikit/quikitwindow.mm b/src/plugins/platforms/uikit/quikitwindow.mm
index 29ca88b75a..cc17dbcbfb 100644
--- a/src/plugins/platforms/uikit/quikitwindow.mm
+++ b/src/plugins/platforms/uikit/quikitwindow.mm
@@ -48,12 +48,12 @@
 #include <QtDebug>
 #include <QtGui/QApplication>
 #include <QtGui/QKeyEvent>
-#include <QtGui/QPlatformGLContext>
+#include <QtGui/QPlatformOpenGLContext>
 #include <QtGui/QWindowSystemInterface>
 
 #include <QtDebug>
 
-class EAGLPlatformContext : public QPlatformGLContext
+class EAGLPlatformContext : public QPlatformOpenGLContext
 {
 public:
     EAGLPlatformContext(EAGLView *view)
@@ -91,13 +91,13 @@ public:
 
     void makeCurrent()
     {
-        QPlatformGLContext::makeCurrent();
+        QPlatformOpenGLContext::makeCurrent();
         [mView makeCurrent];
     }
 
     void doneCurrent()
     {
-        QPlatformGLContext::doneCurrent();
+        QPlatformOpenGLContext::doneCurrent();
     }
 
     void swapBuffers()
@@ -381,7 +381,7 @@ UIWindow *QUIKitWindow::ensureNativeWindow()
     return mWindow;
 }
 
-QPlatformGLContext *QUIKitWindow::glContext() const
+QPlatformOpenGLContext *QUIKitWindow::glContext() const
 {
     if (!mContext) {
         mContext = new EAGLPlatformContext(mView);
diff --git a/src/plugins/platforms/uikit/uikit.pro b/src/plugins/platforms/uikit/uikit.pro
index 45a48dc92a..5e3a0e6b7c 100644
--- a/src/plugins/platforms/uikit/uikit.pro
+++ b/src/plugins/platforms/uikit/uikit.pro
@@ -1,5 +1,5 @@
 TARGET = quikit
-load(qt_plugin)
+load(qpa/plugin)
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 QT += opengl
@@ -22,6 +22,6 @@ HEADERS = quikitsoftwareinputhandler.h
 #add libz for freetype.
 LIBS += -lz
 
-#include(../fontdatabases/basicunix/basicunix.pri)
+#load(qpa/fontdatabases/basicunix)
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target