1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build without 'library'

Browse Source 
Without QT_CONFIG(library) qdbus_resolve_conditionally would be declared
but not defined.

Change-Id: Id90f6c736080e4c1609568b3fab1f464c0e46aa3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Frederik Gladhorn 2018-07-12 18:10:22 +02:00 committed by Simon Hausmann
parent 9a58ba4793
commit ff78e6fe35
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbus/qdbus_symbols.cpp
View File

@ -126,14 +126,16 @@ bool qdbus_loadLibDBus()
#endif #endif
} }
#if QT_CONFIG(library)
void (*qdbus_resolve_conditionally(const char *name))() void (*qdbus_resolve_conditionally(const char *name))()
{ {
#if QT_CONFIG(library)
if (qdbus_loadLibDBus()) if (qdbus_loadLibDBus())
return qdbus_libdbus->resolve(name); return qdbus_libdbus->resolve(name);
#else
Q_UNUSED(name);
#endif
return 0; return 0;
} }
#endif
void (*qdbus_resolve_me(const char *name))() void (*qdbus_resolve_me(const char *name))()
{ {