diff options
| author | Jan Arne Petersen <jan.petersen@kdab.com> | 2013-09-25 13:26:28 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@digia.com> | 2013-11-22 15:45:33 +0100 |
| commit | d7a8b4eadf3696218296df706e123b9038146236 (patch) | |
| tree | c59294346d987f44038f3bfbd65c56676ef10e6b /src/qtwaylandscanner | |
| parent | 32de71173e6d306e9f4b18af1da1784cfcf8ac8e (diff) | |
Fix creating new objects (with id == 0)
Change-Id: I2a6740d5e1a4367d2980e3fb17617c2f1cb95041
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 268747bb5..fcd8ec829 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -622,7 +622,7 @@ void process(QXmlStreamReader &xml) printf(" Resource *resource = %s_allocate();\n", interfaceNameStripped); printf(" resource->%s = this;\n", interfaceNameStripped); printf("\n"); - printf(" struct ::wl_resource *handle = wl_client_add_object(client, &::%s_interface, %s, id, resource);\n", interfaceName, interfaceMember.constData()); + printf(" struct ::wl_resource *handle = id != 0 ? wl_client_add_object(client, &::%s_interface, %s, id, resource) : wl_client_new_object(client, &::%s_interface, %s, resource);\n", interfaceName, interfaceMember.constData(), interfaceName, interfaceMember.constData()); printf("\n"); printf(" handle->destroy = destroy_func;\n"); printf(" resource->handle = handle;\n"); |