diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2019-09-21 14:55:08 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-09-23 10:23:20 +0200 |
| commit | e993a7f1f24303b4b1274b8b0d5e747bc00b9dce (patch) | |
| tree | 84986dcb7fb5b143dee61b6e73db656e70ee5d98 /src/plugins/canbus/peakcan/peakcanbackend.cpp | |
| parent | 9b32e78758798ba2a2e97cafde79cc53cad0348f (diff) | |
CAN: Avoid symbol clashes on static builds
Having the same function name in a global namespace
can lead the linker to pick an arbitrary one instead
the right one.
[ChangeLog] Fixed problems on static builds where
an arbitrary version of resolveSymbol() was used
instead the correct one.
Fixes: QTBUG-78546
Change-Id: I0ff9bc3e5905b3b9694dfe9d446b2a52700f213f
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
(cherry picked from commit 80144b89ca1adede0db9d6e485037f5e431216c3)
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/canbus/peakcan/peakcanbackend.cpp')
| -rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index f8932e9..411223a 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -66,7 +66,7 @@ bool PeakCanBackend::canCreate(QString *errorReason) #ifdef LINK_LIBPCANBASIC return true; #else - static bool symbolsResolved = resolveSymbols(pcanLibrary()); + static bool symbolsResolved = resolvePeakCanSymbols(pcanLibrary()); if (Q_UNLIKELY(!symbolsResolved)) { *errorReason = pcanLibrary()->errorString(); return false; |