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

trunk/src/dbus/qdbusreply.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)
@@ -52 +52 @@
 #include <QtDBus/qdbuspendingreply.h>
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_HEADER
 
@@ -58 +60 @@
 QT_MODULE(DBus)
 
-QDBUS_EXPORT void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data);
+Q_DBUS_EXPORT void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data);
 
 template<typename T>
@@ -194 +196 @@
 QT_END_HEADER
 
+#endif // QT_NO_DBUS
 #endif