From 3822bac2b7617c6593c2d21ed6203d23aede0613 Mon Sep 17 00:00:00 2001 From: Arnaud Vrac Date: Tue, 16 Sep 2014 17:36:18 +0200 Subject: [PATCH] Reset wayland object pointer after destroy This allows calling init() on the wayland object again after destroy() Change-Id: I7856cc8ec676eee7575e15a5d1f81cf1b89537c8 Reviewed-by: Giulio Camuffo --- src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp index a0b4afcfaf2..784687d2649 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp @@ -88,6 +88,7 @@ struct WaylandArgument { struct WaylandEvent { bool request; QByteArray name; + QByteArray type; QList arguments; }; @@ -124,6 +125,7 @@ WaylandEvent readEvent(QXmlStreamReader &xml, bool request) WaylandEvent event; event.request = request; event.name = byteArrayValue(xml, "name"); + event.type = byteArrayValue(xml, "type"); while (xml.readNextStartElement()) { if (xml.name() == "arg") { WaylandArgument argument; @@ -998,6 +1000,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr } } printf(");\n"); + if (e.type == "destructor") + printf(" m_%s = 0;\n", interfaceName); printf(" }\n"); }