Changeset 846 for trunk/src/dbus/qdbusmessage_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/qdbusmessage_p.h (modified) (4 diffs)

trunk/src/dbus/qdbusmessage_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)
@@ -60 +60 @@
 struct DBusMessage;
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_NAMESPACE
 
@@ -86 +88 @@
     uint localMessage : 1;
     mutable uint parametersValidated : 1;
+    uint autoStartService : 1;
 
     static void setParametersValidated(QDBusMessage &msg, bool enable)
@@ -102 +105 @@
 QT_END_NAMESPACE
 
+#endif // QT_NO_DBUS
 #endif