diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/dbus/qdbusserver.cpp | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/dbus/qdbusserver.cpp')
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 027ce935d6..b1f9be2c2a 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -68,7 +68,11 @@ QDBusServer::QDBusServer(const QString &address, QObject *parent) if (!qdbus_loadLibDBus()) return; - emit QDBusConnectionManager::instance()->serverRequested(address, this); + QDBusConnectionManager *instance = QDBusConnectionManager::instance(); + if (!instance) + return; + + emit instance->serverRequested(address, this); QObject::connect(d, SIGNAL(newServerConnection(QDBusConnectionPrivate*)), this, SLOT(_q_newConnection(QDBusConnectionPrivate*)), Qt::QueuedConnection); } @@ -93,7 +97,11 @@ QDBusServer::QDBusServer(QObject *parent) return; } - emit QDBusConnectionManager::instance()->serverRequested(address, this); + QDBusConnectionManager *instance = QDBusConnectionManager::instance(); + if (!instance) + return; + + emit instance->serverRequested(address, this); QObject::connect(d, SIGNAL(newServerConnection(QDBusConnectionPrivate*)), this, SLOT(_q_newConnection(QDBusConnectionPrivate*)), Qt::QueuedConnection); } |