Changeset 846 for trunk/src/dbus/qdbus_symbols_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/dbus/qdbus_symbols_p.h (modified) (5 diffs)

trunk/src/dbus/qdbus_symbols_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -57 +57 @@
 #include <QtCore/qglobal.h>
 #include <dbus/dbus.h>
+
+#ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
@@ -196 +198 @@
 /* dbus-message.h */
 DEFINEFUNC(DBusMessage* , dbus_message_copy, (const DBusMessage *message),
+           (message), return)
+DEFINEFUNC(dbus_bool_t   , dbus_message_get_auto_start, (DBusMessage   *message),
            (message), return)
 DEFINEFUNC(const char*   , dbus_message_get_error_name, (DBusMessage   *message),
@@ -269 +273 @@
 DEFINEFUNC(DBusMessage*  , dbus_message_ref, (DBusMessage   *message),
            (message), return)
+DEFINEFUNC(void          , dbus_message_set_auto_start, (DBusMessage   *message,
+                                                         dbus_bool_t    auto_start),
+           (message, auto_start), return)
 DEFINEFUNC(dbus_bool_t   , dbus_message_set_destination, (DBusMessage   *message,
                                                           const char    *destination),
@@ -363 +370 @@
 QT_END_NAMESPACE
 
-#endif
+#endif // QT_NO_DBUS
+#endif // QDBUS_SYMBOLS_P_H