Update to compile with changes to Refactor branch.

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.cpp b/src/qt-compositor/compositor_api/waylandcompositor.cpp
index 92bbc80..317ca2b 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.cpp
+++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp
@@ -50,7 +50,7 @@
 #include "waylandsurfaceitem.h"
 #endif
 
-WaylandCompositor::WaylandCompositor(QWindow *window, QGLContext *context, const char *socketName)
+WaylandCompositor::WaylandCompositor(QWindow *window, QOpenGLContext *context, const char *socketName)
     : m_compositor(0)
     , m_glContext(context)
     , m_toplevel_widget(window)
@@ -110,7 +110,7 @@ WaylandSurface *WaylandCompositor::directRenderSurface() const
     return surf ? surf->handle() : 0;
 }
 
-QGLContext * WaylandCompositor::glContext() const
+QOpenGLContext * WaylandCompositor::glContext() const
 {
     return m_glContext;
 }

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.h b/src/qt-compositor/compositor_api/waylandcompositor.h
index b657575..a0aa140 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.h
+++ b/src/qt-compositor/compositor_api/waylandcompositor.h
@@ -62,7 +62,7 @@ namespace Wayland
 class WaylandCompositor
 {
 public:
-    WaylandCompositor(QWindow *window = 0, QGLContext *context = 0, const char *socketName = 0);
+    WaylandCompositor(QWindow *window = 0, QOpenGLContext *context = 0, const char *socketName = 0);
     virtual ~WaylandCompositor();
 
     void frameFinished(WaylandSurface *surface = 0);
@@ -74,7 +74,7 @@ public:
     void setDirectRenderSurface(WaylandSurface *surface);
     WaylandSurface *directRenderSurface() const;
 
-    QGLContext *glContext() const;
+    QOpenGLContext *glContext() const;
     QWindow *window()const;
 
     virtual void surfaceCreated(WaylandSurface *surface) = 0;
@@ -98,7 +98,7 @@ private:
     static void retainedSelectionChanged(QMimeData *mimeData, void *param);
 
     Wayland::Compositor *m_compositor;
-    QGLContext *m_glContext;
+    QOpenGLContext *m_glContext;
     QWindow  *m_toplevel_widget;
     QByteArray m_socket_name;
 };

diff --git a/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp
index 0213aa1..589cf25 100644 (file)
--- a/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp
+++ b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp
@@ -41,7 +41,7 @@
 #include "mesaeglintegration.h"
 
 #include <QtGui/QPlatformNativeInterface>
-#include <QtWidgets/private/qapplication_p.h>
+#include <QtGui/QGuiApplication>
 
 #define EGL_EGLEXT_PROTOTYPES
 #include <EGL/egl.h>
@@ -81,7 +81,7 @@ void MesaEglIntegration::initializeHardware(Wayland::Display *waylandDisplay)
     //We need a window id now :)
     m_compositor->window()->winId();
 
-    QPlatformNativeInterface *nativeInterface = QApplicationPrivate::platformIntegration()->nativeInterface();
+    QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
     if (nativeInterface) {
         d->egl_display = nativeInterface->nativeResourceForWindow("EglDisplay", m_compositor->window());
         if (d->egl_display) {
@@ -94,7 +94,7 @@ void MesaEglIntegration::initializeHardware(Wayland::Display *waylandDisplay)
         }
 
         if (!d->valid)
-            fprintf(stderr, "Failed to initialize egl display\n");
+            qWarning("Failed to initialize egl display\n");
 
         d->egl_context = nativeInterface->nativeResourceForContext("EglContext", m_compositor->glContext()->contextHandle());
     }
@@ -104,7 +104,7 @@ GLuint MesaEglIntegration::createTextureFromBuffer(wl_buffer *buffer)
 {
     Q_D(MesaEglIntegration);
     if (!d->valid) {
-        fprintf(stderr, "createTextureFromBuffer() failed\n");
+        qWarning("createTextureFromBuffer() failed\n");
         return 0;
     }
 

diff --git a/src/qt-compositor/wayland_wrapper/wloutput.cpp b/src/qt-compositor/wayland_wrapper/wloutput.cpp
index 52ea5d8..fbc3ec2 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wloutput.cpp
+++ b/src/qt-compositor/wayland_wrapper/wloutput.cpp
@@ -39,9 +39,9 @@
 ****************************************************************************/
 
 #include "wloutput.h"
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
+#include <QGuiApplication>
+#include <QtGui/QScreen>
+#include <QRect>
 
 namespace Wayland {
 
@@ -58,10 +58,11 @@ void output_post_geometry(struct wl_client *client, struct wl_object *global, ui
 
 
 Output::Output()
-    : m_size(QApplication::desktop()->screenGeometry().size())
-    , m_displayId(-1)
+    : m_displayId(-1)
     , m_numQueued(0)
 {
+    QScreen *screen = QGuiApplication::primaryScreen();
+    m_size = screen->availableGeometry().size();
 }
 
 }

diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.h b/src/qt-compositor/wayland_wrapper/wlsurface.h
index 3efd1d4..61f1a21 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlsurface.h
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.h
@@ -50,7 +50,6 @@
 
 #include <QtCore/QTextStream>
 #include <QtCore/QMetaType>
-#include <QtGui/private/qguiapplication_p.h>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
 #include <QtOpenGL/QGLContext>