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

trunk/src/dbus/qdbuspendingcall.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)
@@ -50 +50 @@
 #include <QtDBus/qdbusmessage.h>
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_HEADER
 
@@ -61 +63 @@
 
 class QDBusPendingCallPrivate;
-class QDBUS_EXPORT QDBusPendingCall
+class Q_DBUS_EXPORT QDBusPendingCall
 {
 public:
@@ -95 +97 @@
 
 class QDBusPendingCallWatcherPrivate;
-class QDBUS_EXPORT QDBusPendingCallWatcher: public QObject, public QDBusPendingCall
+class Q_DBUS_EXPORT QDBusPendingCallWatcher: public QObject, public QDBusPendingCall
 {
     Q_OBJECT
@@ -120 +122 @@
 QT_END_HEADER
 
+#endif // QT_NO_DBUS
 #endif