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

Reset wayland object pointer after destroy

Browse Source 
This allows calling init() on the wayland object again after destroy()

Change-Id: I7856cc8ec676eee7575e15a5d1f81cf1b89537c8
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
This commit is contained in:
Arnaud Vrac 2014-09-16 17:36:18 +02:00
parent 679e14272c
commit 3822bac2b7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ struct WaylandArgument {
struct WaylandEvent { struct WaylandEvent {
bool request; bool request;
QByteArray name; QByteArray name;
QByteArray type;
QList<WaylandArgument> arguments; QList<WaylandArgument> arguments;
}; };
@ -124,6 +125,7 @@ WaylandEvent readEvent(QXmlStreamReader &xml, bool request)
WaylandEvent event; WaylandEvent event;
event.request = request; event.request = request;
event.name = byteArrayValue(xml, "name"); event.name = byteArrayValue(xml, "name");
event.type = byteArrayValue(xml, "type");
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "arg") { if (xml.name() == "arg") {
WaylandArgument argument; WaylandArgument argument;
@ -998,6 +1000,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
} }
} }
printf(");\n"); printf(");\n");
if (e.type == "destructor")
printf(" m_%s = 0;\n", interfaceName);
printf(" }\n"); printf(" }\n");
} }