Compile against latest qtbase

Change-Id: I6111cd2e280a7cff610d3f89d51fb3964d61b51f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

7 files changed, 14 insertions, 8 deletions

diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h
index d3bf5a785..df91856c4 100644
--- a/src/client/qwaylandinputcontext_p.h
+++ b/src/client/qwaylandinputcontext_p.h
@@ -58,6 +58,7 @@
 #include <QLoggingCategory>
 #include <QPointer>
 #include <QRectF>
+#include <QLocale>
 
 #include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
 #include <qwaylandinputmethodeventbuilder_p.h>
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 45431cfa1..0b00a6edc 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -51,6 +51,7 @@
 
 #include <QtQuick/QSGSimpleTextureNode>
 #include <QtQuick/QQuickWindow>
+#include <QtQuick/qsgtexture.h>
 
 #include <QtCore/QMutexLocker>
 #include <QtCore/QMutex>
@@ -300,7 +301,7 @@ public:
                 auto texture = buffer.toOpenGLTexture();
                 GLuint textureId = texture->textureId();
                 auto size = surface->bufferSize();
-                m_sgTex = surfaceItem->window()->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, textureId, 0, size, opt);
+                m_sgTex = QPlatformInterface::QSGOpenGLTexture::fromNative(textureId, surfaceItem->window(), size, opt);
 #else
                 qCWarning(qLcWaylandCompositor) << "Without OpenGL support only shared memory textures are supported";
 #endif
diff --git a/src/hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h b/src/hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h
index f38c2e151..1ce2ad991 100644
--- a/src/hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h
+++ b/src/hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h
@@ -40,6 +40,7 @@
 #ifndef DMABUFSERVERBUFFERINTEGRATION_H
 #define DMABUFSERVERBUFFERINTEGRATION_H
 
+#include <QtCore/QVariant>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 #include "qwayland-qt-dmabuf-server-buffer.h"
 #include <QtWaylandClient/private/qwaylandserverbufferintegration_p.h>
diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
index 64201476d..dc6ec1364 100644
--- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
@@ -41,6 +41,7 @@
 #define DRMEGLSERVERBUFFERINTEGRATION_H
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
+#include <QtCore/QVariant>
 #include "qwayland-drm-egl-server-buffer.h"
 #include <QtWaylandClient/private/qwaylandserverbufferintegration_p.h>
 
diff --git a/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h b/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h
index 4e9f8c741..a66a37b90 100644
--- a/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h
@@ -30,6 +30,7 @@
 #ifndef DMABUFSERVERBUFFERINTEGRATION_H
 #define DMABUFSERVERBUFFERINTEGRATION_H
 
+#include <QtCore/QVariant>
 #include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h>
 
 #include "qwayland-server-qt-dmabuf-server-buffer.h"
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
index eab5f0c56..2108632e4 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
@@ -30,6 +30,7 @@
 #ifndef DRMEGLSERVERBUFFERINTEGRATION_H
 #define DRMEGLSERVERBUFFERINTEGRATION_H
 
+#include <QtCore/QVariant>
 #include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h>
 
 #include "qwayland-server-drm-egl-server-buffer.h"
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 8cc5fd470..e984b8684 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -223,7 +223,7 @@ Scanner::WaylandEvent Scanner::readEvent(QXmlStreamReader &xml, bool request)
         .arguments = {},
     };
     while (xml.readNextStartElement()) {
-        if (xml.name() == "arg") {
+        if (xml.name() == u"arg") {
             WaylandArgument argument = {
                 .name      = byteArrayValue(xml, "name"),
                 .type      = byteArrayValue(xml, "type"),
@@ -247,7 +247,7 @@ Scanner::WaylandEnum Scanner::readEnum(QXmlStreamReader &xml)
     };
 
     while (xml.readNextStartElement()) {
-        if (xml.name() == "entry") {
+        if (xml.name() == u"entry") {
             WaylandEnumEntry entry = {
                 .name    = byteArrayValue(xml, "name"),
                 .value   = byteArrayValue(xml, "value"),
@@ -273,11 +273,11 @@ Scanner::WaylandInterface Scanner::readInterface(QXmlStreamReader &xml)
     };
 
     while (xml.readNextStartElement()) {
-        if (xml.name() == "event")
+        if (xml.name() == u"event")
             interface.events.push_back(readEvent(xml, false));
-        else if (xml.name() == "request")
+        else if (xml.name() == u"request")
             interface.requests.push_back(readEvent(xml, true));
-        else if (xml.name() == "enum")
+        else if (xml.name() == u"enum")
             interface.enums.push_back(readEnum(xml));
         else
             xml.skipCurrentElement();
@@ -438,7 +438,7 @@ bool Scanner::process()
     if (!m_xml->readNextStartElement())
         return false;
 
-    if (m_xml->name() != "protocol") {
+    if (m_xml->name() != u"protocol") {
         m_xml->raiseError(QStringLiteral("The file is not a wayland protocol file."));
         return false;
     }
@@ -458,7 +458,7 @@ bool Scanner::process()
     std::vector<WaylandInterface> interfaces;
 
     while (m_xml->readNextStartElement()) {
-        if (m_xml->name() == "interface")
+        if (m_xml->name() == u"interface")
             interfaces.push_back(readInterface(*m_xml));
         else
             m_xml->skipCurrentElement();