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

Change-Id: I29192963efa6753a4cf222a3aec92ab400deb2f0

2 files changed, 2 insertions, 3 deletions

diff --git a/src/compositor/extensions/qwaylandivisurface.cpp b/src/compositor/extensions/qwaylandivisurface.cpp
index f0beef738..0ae488def 100644
--- a/src/compositor/extensions/qwaylandivisurface.cpp
+++ b/src/compositor/extensions/qwaylandivisurface.cpp
@@ -45,6 +45,7 @@
 #endif
 
 #include <QtWaylandCompositor/QWaylandResource>
+#include <QDebug>
 
 #include <QtWaylandCompositor/private/qwaylandutils_p.h>
 
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 91a6d6eef..5914ea368 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);