Changeset 846 for trunk/src/dbus/qdbuspendingcall.cpp

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.cpp (modified) (3 diffs)

trunk/src/dbus/qdbuspendingcall.cpp

@@ -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)
@@ -48 +48 @@
 #include "qcoreevent.h"
 #include <private/qobject_p.h>
+
+#ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
@@ -533 +535 @@
 QT_END_NAMESPACE
 
+#endif // QT_NO_DBUS
+
 #include "moc_qdbuspendingcall.cpp"