diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 18:47:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-01 09:10:26 +0200 |
| commit | 0e6ee136c91432d4ceeeda64e5a5fa88231398d4 (patch) | |
| tree | 6060e002af2900007895f6efa757989dd4c190c9 /src/dbus/qdbusserver.cpp | |
| parent | 418869d9158ea5cd998ba30778b0b7173b48161b (diff) | |
| parent | 17294c5e4d15d5776f6e414b03671a4a9ed4993d (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/testlib/qtestblacklist.cpp
src/widgets/accessible/qaccessiblewidgets.cpp
Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
Diffstat (limited to 'src/dbus/qdbusserver.cpp')
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 3b7b797cff..2fc7c75d83 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -34,6 +34,7 @@ #include "qdbusserver.h" #include "qdbusconnection_p.h" #include "qdbusconnectionmanager_p.h" +#include "qdbusutil_p.h" #ifndef QT_NO_DBUS @@ -130,7 +131,7 @@ bool QDBusServer::isConnected() const */ QDBusError QDBusServer::lastError() const { - return d ? d->lastError : QDBusError(QDBusError::Disconnected, QStringLiteral("Not connected.")); + return d ? d->lastError : QDBusError(QDBusError::Disconnected, QDBusUtil::disconnectedErrorMessage()); } /*! |