diff options
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbus_symbols.cpp | 6 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index 44597c39b6..fed18350bb 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -62,6 +62,12 @@ void qdbus_unloadLibDBus() bool qdbus_loadLibDBus() { +#ifdef QT_BUILD_INTERNAL + // this is to simulate a library load failure for our autotest suite. + if (!qgetenv("QT_SIMULATE_DBUS_LIBFAIL").isEmpty()) + return false; +#endif + static volatile bool triedToLoadLibrary = false; #ifndef QT_NO_THREAD QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&qdbus_resolve_me)); diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 0b4133c8dd..9656903846 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1061,7 +1061,7 @@ public: if (!instance) { qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); - } else { + } else if (QDBusConnectionPrivate::d(*this)) { QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); } } |