1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile against latest qtbase

Browse Source 
Change-Id: I6111cd2e280a7cff610d3f89d51fb3964d61b51f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Lars Knoll 2020-08-24 15:51:41 +02:00
parent 6d8b4bbadb
commit a8b91863d3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/wayland/qwaylandinputcontext_p.h
View File

@ -58,6 +58,7 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QPointer> #include <QPointer>
#include <QRectF> #include <QRectF>
#include <QLocale>
#include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h> #include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
#include <qwaylandinputmethodeventbuilder_p.h> #include <qwaylandinputmethodeventbuilder_p.h>

14
src/tools/qtwaylandscanner/qtwaylandscanner.cpp
View File

@ -223,7 +223,7 @@ Scanner::WaylandEvent Scanner::readEvent(QXmlStreamReader &xml, bool request)
.arguments = {}, .arguments = {},
}; };
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "arg") { if (xml.name() == u"arg") {
WaylandArgument argument = { WaylandArgument argument = {
.name = byteArrayValue(xml, "name"), .name = byteArrayValue(xml, "name"),
.type = byteArrayValue(xml, "type"), .type = byteArrayValue(xml, "type"),
@ -247,7 +247,7 @@ Scanner::WaylandEnum Scanner::readEnum(QXmlStreamReader &xml)
}; };
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "entry") { if (xml.name() == u"entry") {
WaylandEnumEntry entry = { WaylandEnumEntry entry = {
.name = byteArrayValue(xml, "name"), .name = byteArrayValue(xml, "name"),
.value = byteArrayValue(xml, "value"), .value = byteArrayValue(xml, "value"),
@ -273,11 +273,11 @@ Scanner::WaylandInterface Scanner::readInterface(QXmlStreamReader &xml)
}; };
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "event") if (xml.name() == u"event")
interface.events.push_back(readEvent(xml, false)); 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)); interface.requests.push_back(readEvent(xml, true));
else if (xml.name() == "enum") else if (xml.name() == u"enum")
interface.enums.push_back(readEnum(xml)); interface.enums.push_back(readEnum(xml));
else else
xml.skipCurrentElement(); xml.skipCurrentElement();
@ -438,7 +438,7 @@ bool Scanner::process()
if (!m_xml->readNextStartElement()) if (!m_xml->readNextStartElement())
return false; 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.")); m_xml->raiseError(QStringLiteral("The file is not a wayland protocol file."));
return false; return false;
} }
@ -458,7 +458,7 @@ bool Scanner::process()
std::vector<WaylandInterface> interfaces; std::vector<WaylandInterface> interfaces;
while (m_xml->readNextStartElement()) { while (m_xml->readNextStartElement()) {
if (m_xml->name() == "interface") if (m_xml->name() == u"interface")
interfaces.push_back(readInterface(*m_xml)); interfaces.push_back(readInterface(*m_xml));
else else
m_xml->skipCurrentElement(); m_xml->skipCurrentElement();