summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusutil.cpp
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-10-27 15:05:59 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-10-27 15:05:59 (GMT)
commit7ca94a08b9c232aaccb74fa85912515b8f9a6619 (patch)
treee60229477bc8269cf14904620bf0fc5ad18ef6d0 /src/dbus/qdbusutil.cpp
parentf8c9314d6224948c28487e291b4cdad0049682c7 (diff)
parent7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff)
downloadQt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.zip
Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.gz
Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/dbus/qdbusutil.cpp')
-rw-r--r--src/dbus/qdbusutil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index 2fcdc73..b7b0407 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -309,7 +309,7 @@ namespace QDBusUtil
Returns true if \a connName is a valid unique connection name.
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)
{