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

trunk/src/dbus/qdbusutil.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)
@@ -47 +47 @@
 
 #include "qdbusargument.h"
+
+#ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
@@ -308 +310 @@
 
         Unique connection names start with a colon (":") and are followed by a list of dot-separated
-        components composed of ASCII letters, digits, the hypen or the underscore ("_") character.
+        components composed of ASCII letters, digits, the hyphen or the underscore ("_") character.
     */
     bool isValidUniqueConnectionName(const QString &connName)
@@ -467 +469 @@
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS