diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:01:19 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:01:19 +0100 |
commit | 789a2c79d04c477ea9a9ccd9d08a49f514693eec (patch) | |
tree | 5bc64f539058a0967a9a2c0b65a8afc3d958f5a9 /src/qtwaylandscanner | |
parent | a214aae8871952302055ae19b8e9f1d7397d88c1 (diff) | |
parent | 4fa1ed2dfe7ae42b940d6d28e4c1066853e7768a (diff) | |
download | qtwayland-789a2c79d04c477ea9a9ccd9d08a49f514693eec.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I29192963efa6753a4cf222a3aec92ab400deb2f0
Diffstat (limited to 'src/qtwaylandscanner')
-rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 91a6d6ee..5914ea36 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -126,7 +126,7 @@ private: bool Scanner::parseArguments(int argc, char **argv) { - QByteArray m_scannerName = argv[0]; + m_scannerName = argv[0]; if (argc <= 2 || !parseOption(argv[1])) return false; @@ -1220,8 +1220,6 @@ bool Scanner::process() for (int i = 0; i < e.arguments.size(); ++i) { printf("\n"); 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(); if (a.type == "string") printf(" QString::fromUtf8(%s)", argumentName); |