diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-28 15:40:10 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-28 15:40:10 (GMT) |
| commit | cca6d17a40e3435b3e41c09a5eba20f50b28e9ae (patch) | |
| tree | f1135171e2c56f03f65405e54ceb47fb5d756d2c /examples/dbus/dbus-chat/chat_interface.cpp | |
| parent | c58ac55bbe65866db85ba1338642c00fe5cc2a70 (diff) | |
| parent | 9fc350e8358f55c13169a9383bd2bd85592bb231 (diff) | |
| download | Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.zip Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.tar.gz Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.tar.bz2 | |
Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into integration
Conflicts:
examples/dbus/dbus-chat/chat_adaptor.cpp
examples/dbus/dbus-chat/chat_adaptor.h
examples/dbus/dbus-chat/chat_interface.cpp
examples/dbus/dbus-chat/chat_interface.h
examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
examples/dbus/remotecontrolledcar/controller/car_interface.cpp
examples/dbus/remotecontrolledcar/controller/car_interface_p.h
Diffstat (limited to 'examples/dbus/dbus-chat/chat_interface.cpp')
| -rw-r--r-- | examples/dbus/dbus-chat/chat_interface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/dbus/dbus-chat/chat_interface.cpp b/examples/dbus/dbus-chat/chat_interface.cpp index f187ee0..3aba098 100644 --- a/examples/dbus/dbus-chat/chat_interface.cpp +++ b/examples/dbus/dbus-chat/chat_interface.cpp @@ -38,10 +38,10 @@ ** $QT_END_LICENSE$ ** ** -** This file was generated by dbusxml2cpp version 0.6 -** Command line was: dbusxml2cpp -i chat_interface.h -p :chat_interface.cpp chat/com.trolltech.chat.xml +** This file was generated by qdbusxml2cpp version 0.7 +** Command line was: qdbusxml2cpp -i chat_interface.h -p :chat_interface.cpp com.trolltech.chat.xml ** -** dbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** ** This is an auto-generated file. ** This file may have been hand-edited. Look for HAND-EDIT comments |