diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-03 15:00:06 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-06 14:15:53 +0000 |
commit | 2839e8d01060cff9102dfcc424886b752ca58443 (patch) | |
tree | 957a26ee79984ee0a7545bfd21592aa57a354a79 | |
parent | 2ca151a8d1de925e16ab9010f3c69b806326a923 (diff) |
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>
-rw-r--r-- | src/dbus/qdbus_symbols.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index d178a37353..395a436869 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -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 |