diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:05:08 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-16 22:21:52 +0300 |
| commit | 01afc8c810201b93a12fe7030344e03566d99001 (patch) | |
| tree | 27727b38370209dc158856b4bb4d32ccd2e49fbe /src/dbus | |
| parent | a090076e93487f8e461d9b866b9da1c0c21cb59b (diff) | |
| parent | 49da5ce10034161017b261e000d4e9063d962401 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3cf73c53cf131d0babfb558c2507bed0e0fc5f08
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusintrospection.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusmetatype.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/dbus/qdbusintrospection.cpp b/src/dbus/qdbusintrospection.cpp index a700a2a215..6e406f7616 100644 --- a/src/dbus/qdbusintrospection.cpp +++ b/src/dbus/qdbusintrospection.cpp @@ -195,7 +195,7 @@ QT_BEGIN_NAMESPACE \inmodule QtDBus \brief Information about one interface on the bus. - Each interface on D-Bus has an unique \a name, identifying where that interface was defined. + Each interface on D-Bus has a unique \a name, identifying where that interface was defined. Interfaces may have annotations, methods, signals and properties, but none are mandatory. */ diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index fb2b407997..6ed6c43e9d 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -216,7 +216,6 @@ Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock) void QDBusMetaType::registerMarshallOperators(int id, MarshallFunction mf, DemarshallFunction df) { - QByteArray var; QVector<QDBusCustomTypeInfo> *ct = customTypes(); if (id < 0 || !mf || !df || !ct) return; // error! |