diff options
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/doc/src/dbus-adaptors.qdoc | 2 | ||||
-rw-r--r-- | src/dbus/qdbusabstractadaptor.cpp | 4 | ||||
-rw-r--r-- | src/dbus/qdbusargument.cpp | 2 | ||||
-rw-r--r-- | src/dbus/qdbusconnection.cpp | 4 | ||||
-rw-r--r-- | src/dbus/qdbusconnectioninterface.cpp | 2 | ||||
-rw-r--r-- | src/dbus/qdbuserror.cpp | 6 | ||||
-rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 3 | ||||
-rw-r--r-- | src/dbus/qdbuspendingcall.cpp | 2 | ||||
-rw-r--r-- | src/dbus/qdbusvirtualobject.cpp | 1 |
9 files changed, 22 insertions, 4 deletions
diff --git a/src/dbus/doc/src/dbus-adaptors.qdoc b/src/dbus/doc/src/dbus-adaptors.qdoc index 496e36ea92..7d8386d515 100644 --- a/src/dbus/doc/src/dbus-adaptors.qdoc +++ b/src/dbus/doc/src/dbus-adaptors.qdoc @@ -193,7 +193,7 @@ The delayed reply itself is requested from Qt D-Bus by calling QDBusMessage::reply() on the original message. It then becomes the - resposibility of the called code to eventually send a reply to the + responsibility of the called code to eventually send a reply to the caller. \warning When a caller places a method call and waits for a reply, it will diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index bf0e33e26e..80895bc48c 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -166,7 +166,7 @@ QDBusAbstractAdaptor::~QDBusAbstractAdaptor() Toggles automatic signal relaying from the real object (see object()). Automatic signal relaying consists of signal-to-signal connection of the signals on the parent - that have the exact same method signatue in both classes. + that have the exact same method signature in both classes. If \a enable is set to true, connect the signals; if set to false, disconnect all signals. */ @@ -449,4 +449,6 @@ void QDBusAdaptorConnector::relaySignal(QObject * _t1, const QMetaObject * _t2, QT_END_NAMESPACE +#include "moc_qdbusabstractadaptor.cpp" + #endif // QT_NO_DBUS diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 5a0f0f013b..1791dd5069 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -709,7 +709,7 @@ const QDBusArgument &QDBusArgument::operator>>(qulonglong &arg) const /*! \overload Extracts one D-Bus primitive argument of type \c{DOUBLE} - (double-precision floating pount) from the D-Bus stream. + (double-precision floating point) from the D-Bus stream. */ const QDBusArgument &QDBusArgument::operator>>(double &arg) const { diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index fef55a3c06..dd12754e39 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1289,6 +1289,10 @@ QByteArray QDBusConnection::localMachineId() QT_END_NAMESPACE +#include "moc_qdbusconnection_p.cpp" +#include "moc_qdbusconnection.cpp" +#include "moc_qdbusconnectionmanager_p.cpp" + #ifdef Q_OS_WIN # include <qt_windows.h> diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp index a2335a1795..42289e47e5 100644 --- a/src/dbus/qdbusconnectioninterface.cpp +++ b/src/dbus/qdbusconnectioninterface.cpp @@ -442,4 +442,6 @@ void QDBusConnectionInterface::disconnectNotify(const QMetaMethod &signal) QT_END_NAMESPACE +#include "moc_qdbusconnectioninterface.cpp" + #endif // QT_NO_DBUS diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index decd345ece..37a147eb02 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -354,12 +354,16 @@ QDebug operator<<(QDebug dbg, const QDBusError &msg) QT_END_NAMESPACE +#ifndef QT_BOOTSTRAPPED +#include "moc_qdbuserror.cpp" +#endif + #endif // QT_NO_DBUS /* MSVC2015 has the warning C4503 at the end of the file: QtPrivate::StaticStringBuilder<QtPrivate::IndexesList<...> - decorated name length exceeded, name was truncated -It is used by qOffsetStringArray in a constexpr evaulation and this code does not exist in the object file, +It is used by qOffsetStringArray in a constexpr evaluation and this code does not exist in the object file, but we still have the warning or even error with -WX flag */ QT_WARNING_DISABLE_MSVC(4503) diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 5265568f42..7e9f0f1acc 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -210,6 +210,9 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature, } else if (signature == "a{ss}") { result.name = "QMap<QString,QString>"; type = qMetaTypeId<QMap<QString, QString> >(); + } else if (signature == "aay") { + result.name = "QByteArrayList"; + type = qMetaTypeId<QByteArrayList>(); } else { result.name = "{D-Bus type \"" + signature + "\"}"; type = registerComplexDBusType(result.name); diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 04d8e3f6c7..46c20474c5 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -546,6 +546,8 @@ void QDBusPendingCallWatcher::waitForFinished() } QT_END_NAMESPACE +#include "moc_qdbuspendingcall_p.cpp" + #endif // QT_NO_DBUS #include "moc_qdbuspendingcall.cpp" diff --git a/src/dbus/qdbusvirtualobject.cpp b/src/dbus/qdbusvirtualobject.cpp index 25dd49c34d..ef7fbe8ff2 100644 --- a/src/dbus/qdbusvirtualobject.cpp +++ b/src/dbus/qdbusvirtualobject.cpp @@ -60,6 +60,7 @@ QDBusVirtualObject::~QDBusVirtualObject() QT_END_NAMESPACE +#include "moc_qdbusvirtualobject.cpp" /*! \class QDBusVirtualObject |