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

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

Browse Source 
Change-Id: Idc8300948e3d52bfe2c14c62230280a68b2ed100
This commit is contained in:
Liang Qi 2015-10-27 10:08:37 +01:00
commit b8fc07100b
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,8 +196,13 @@ QByteArray waylandToCType(const QByteArray &waylandType, const QByteArray &inter
return "int32_t"; return "int32_t";
else if (waylandType == "array") else if (waylandType == "array")
return "wl_array *"; return "wl_array *";
else if (waylandType == "object" || waylandType == "new_id") else if (waylandType == "object" || waylandType == "new_id") {
return isServerSide() ? "struct ::wl_resource *" : interface.isEmpty() ? "struct ::wl_object *" : "struct ::" + interface + " *"; if (isServerSide())
return "struct ::wl_resource *";
if (interface.isEmpty())
return "struct ::wl_object *";
return "struct ::" + interface + " *";
}
return waylandType; return waylandType;
} }
@ -839,7 +844,14 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("\n"); printf("\n");
foreach (const WaylandEvent &e, interface.requests) { foreach (const WaylandEvent &e, interface.requests) {
const WaylandArgument *new_id = newIdArgument(e.arguments); const WaylandArgument *new_id = newIdArgument(e.arguments);
printf(" %s", new_id ? (new_id->interface.isEmpty() ? "void *" : "struct ::" + new_id->interface + " *").constData() : "void "); QByteArray new_id_str = "void ";
if (new_id) {
if (new_id->interface.isEmpty())
new_id_str = "void *";
else
new_id_str = "struct ::" + new_id->interface + " *";
}
printf(" %s", new_id_str.constData());
printEvent(e); printEvent(e);
printf(";\n"); printf(";\n");
} }
@ -955,7 +967,14 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("\n"); printf("\n");
const WaylandEvent &e = interface.requests.at(i); const WaylandEvent &e = interface.requests.at(i);
const WaylandArgument *new_id = newIdArgument(e.arguments); const WaylandArgument *new_id = newIdArgument(e.arguments);
printf(" %s%s::", new_id ? (new_id->interface.isEmpty() ? "void *" : "struct ::" + new_id->interface + " *").constData() : "void ", interfaceName); QByteArray new_id_str = "void ";
if (new_id) {
if (new_id->interface.isEmpty())
new_id_str = "void *";
else
new_id_str = "struct ::" + new_id->interface + " *";
}
printf(" %s%s::", new_id_str.constData(), interfaceName);
printEvent(e); printEvent(e);
printf("\n"); printf("\n");
printf(" {\n"); printf(" {\n");