diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
| commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
| tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/dbus/qdbusabstractinterface.cpp | |
| parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
| parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index a7bdbe4525..2a8681d1d7 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -128,7 +128,7 @@ void QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, QVariant & if (int(mp.type()) != QMetaType::QVariant) { expectedSignature = QDBusMetaType::typeToSignature(where.userType()); if (expectedSignature == 0) { - qWarning("QDBusAbstractInterface: type %s must be registered with QtDBus before it can be " + qWarning("QDBusAbstractInterface: type %s must be registered with Qt D-Bus before it can be " "used to read property %s.%s", mp.typeName(), qPrintable(interface), mp.name()); lastError = QDBusError(QDBusError::Failed, @@ -264,7 +264,7 @@ int QDBusAbstractInterfaceBase::qt_metacall(QMetaObject::Call _c, int _id, void \inmodule QtDBus \since 4.2 - \brief The QDBusAbstractInterface class is the base class for all D-Bus interfaces in the QtDBus binding, allowing access to remote interfaces + \brief The QDBusAbstractInterface class is the base class for all D-Bus interfaces in the Qt D-Bus binding, allowing access to remote interfaces Generated-code classes also derive from QDBusAbstractInterface, all methods described here are also valid for generated-code |