whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbus: allow dbus_shutdown() on QT_NO_LIBRARY && QT_LINKED_LIBDBUS 

If you statically link in a dbus library you'll have dbus_shutdown()
available.

Change-Id: Ieeded63838423a14a5530a4edb0ea46dc9b58d18
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
bb10
Ulf Hermann 2015-07-03 15:00:06 +02:00
parent 2ca151a8d1
commit 2839e8d010
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dbus/qdbus_symbols.cpp
View File

@ -144,7 +144,7 @@ void (*qdbus_resolve_me(const char *name))()
#endif
}
#else // QT_LINKED_LIBDBUS
#else
static void qdbus_unloadLibDBus()
{
if (qEnvironmentVariableIsSet("QDBUS_FORCE_SHUTDOWN"))
@ -153,7 +153,7 @@ static void qdbus_unloadLibDBus()
#endif // !QT_LINKED_LIBDBUS
#ifndef QT_NO_LIBRARY
#if defined(QT_LINKED_LIBDBUS) || !defined(QT_NO_LIBRARY)
Q_DESTRUCTOR_FUNCTION(qdbus_unloadLibDBus)
#endif