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

scanner: Make it work with mismatching protocol and file name

Browse Source 
The names of the files that wayland-scanner generates are based on the
protocol file name not the protocol name that is defined in the xml.
When those two mismatch qtwaylandscanner would generate code that fails
to build.

Pick-to: 6.7
Change-Id: Ieecd7a122177530ab1ff890367ce53809a8bb7b9
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Redondo 2024-02-08 09:09:10 +01:00
parent 997b12fd56
commit 8066293430
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QFile> #include <QFile>
#include <QFileInfo>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <vector> #include <vector>
@ -422,6 +423,8 @@ bool Scanner::process()
//QByteArray preProcessorProtocolName = QByteArray(m_protocolName).replace('-', '_').toUpper(); //QByteArray preProcessorProtocolName = QByteArray(m_protocolName).replace('-', '_').toUpper();
QByteArray preProcessorProtocolName = QByteArray(m_protocolName).toUpper(); QByteArray preProcessorProtocolName = QByteArray(m_protocolName).toUpper();
const QByteArray fileBaseName = QFileInfo(file).completeBaseName().toLocal8Bit();
std::vector<WaylandInterface> interfaces; std::vector<WaylandInterface> interfaces;
while (m_xml->readNextStartElement()) { while (m_xml->readNextStartElement()) {
@ -467,9 +470,9 @@ bool Scanner::process()
printf("\n"); printf("\n");
printf("#include \"wayland-server-core.h\"\n"); printf("#include \"wayland-server-core.h\"\n");
if (m_headerPath.isEmpty()) if (m_headerPath.isEmpty())
printf("#include \"wayland-%s-server-protocol.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include \"wayland-%s-server-protocol.h\"\n", fileBaseName.constData());
else else
printf("#include <%s/wayland-%s-server-protocol.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include <%s/wayland-%s-server-protocol.h>\n", m_headerPath.constData(), fileBaseName.constData());
printf("#include <QByteArray>\n"); printf("#include <QByteArray>\n");
printf("#include <QMultiMap>\n"); printf("#include <QMultiMap>\n");
printf("#include <QString>\n"); printf("#include <QString>\n");
@ -632,9 +635,9 @@ bool Scanner::process()
if (m_option == ServerCode) { if (m_option == ServerCode) {
if (m_headerPath.isEmpty()) if (m_headerPath.isEmpty())
printf("#include \"qwayland-server-%s.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include \"qwayland-server-%s.h\"\n", fileBaseName.constData());
else else
printf("#include <%s/qwayland-server-%s.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include <%s/qwayland-server-%s.h>\n", m_headerPath.constData(), fileBaseName.constData());
printf("\n"); printf("\n");
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n"); printf("QT_WARNING_PUSH\n");
@ -965,9 +968,9 @@ bool Scanner::process()
printf("#define %s\n", inclusionGuard.constData()); printf("#define %s\n", inclusionGuard.constData());
printf("\n"); printf("\n");
if (m_headerPath.isEmpty()) if (m_headerPath.isEmpty())
printf("#include \"wayland-%s-client-protocol.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include \"wayland-%s-client-protocol.h\"\n", fileBaseName.constData());
else else
printf("#include <%s/wayland-%s-client-protocol.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include <%s/wayland-%s-client-protocol.h>\n", m_headerPath.constData(), fileBaseName.constData());
printf("#include <QByteArray>\n"); printf("#include <QByteArray>\n");
printf("#include <QString>\n"); printf("#include <QString>\n");
printf("\n"); printf("\n");
@ -1077,9 +1080,9 @@ bool Scanner::process()
if (m_option == ClientCode) { if (m_option == ClientCode) {
if (m_headerPath.isEmpty()) if (m_headerPath.isEmpty())
printf("#include \"qwayland-%s.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include \"qwayland-%s.h\"\n", fileBaseName.constData());
else else
printf("#include <%s/qwayland-%s.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); printf("#include <%s/qwayland-%s.h>\n", m_headerPath.constData(), fileBaseName.constData());
printf("\n"); printf("\n");
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n"); printf("QT_WARNING_PUSH\n");