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

trunk/src/dbus/qdbusserver.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)
@@ -43 +43 @@
 #include "qdbusconnection_p.h"
 
+#ifndef QT_NO_DBUS
+
 QT_BEGIN_NAMESPACE
 
@@ -48 +50 @@
     \class QDBusServer
     \inmodule QtDBus
-    \since 4.2
+    \internal
 
     \brief The QDBusServer class provides peer-to-peer communication
@@ -99 +101 @@
 
 /*!
-    Returns the address this server is assosiated with.
+    Returns the address this server is associated with.
 */
 QString QDBusServer::address() const
@@ -120 +122 @@
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS