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

Merge remote-tracking branch 'origin/5.12' into dev

Browse Source 
Change-Id: I29192963efa6753a4cf222a3aec92ab400deb2f0
This commit is contained in:
Qt Forward Merge Bot 2018-12-04 03:01:19 +01:00
commit e61b0530f4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ private:
bool Scanner::parseArguments(int argc, char **argv) bool Scanner::parseArguments(int argc, char **argv)
{ {
QByteArray m_scannerName = argv[0]; m_scannerName = argv[0];
if (argc <= 2 || !parseOption(argv[1])) if (argc <= 2 || !parseOption(argv[1]))
return false; return false;
@ -1220,8 +1220,6 @@ bool Scanner::process()
for (int i = 0; i < e.arguments.size(); ++i) { for (int i = 0; i < e.arguments.size(); ++i) {
printf("\n"); printf("\n");
const WaylandArgument &a = e.arguments.at(i); const WaylandArgument &a = e.arguments.at(i);
QByteArray cType = waylandToCType(a.type, a.interface);
QByteArray qtType = waylandToQtType(a.type, a.interface, e.request);
const char *argumentName = a.name.constData(); const char *argumentName = a.name.constData();
if (a.type == "string") if (a.type == "string")
printf(" QString::fromUtf8(%s)", argumentName); printf(" QString::fromUtf8(%s)", argumentName);