diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:49 +0200 |
| commit | 709d2a539089e9b0b2b07dcd29a6d770d44f2eba (patch) | |
| tree | 070e255dd14f6079562aae409f78605b84032b3e /src/plugins/canbus/tinycan/tinycanbackend.cpp | |
| parent | e643c01efa467b336fdb6e0d33ad5274291f8a66 (diff) | |
| parent | 77ccec69263567b2b41244e483dfb083b883c6d8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I3a9c5ff32f8adb914471e865a7ce55e3028c0ee1
Diffstat (limited to 'src/plugins/canbus/tinycan/tinycanbackend.cpp')
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 411b917..606927c 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -62,7 +62,7 @@ bool TinyCanBackend::canCreate(QString *errorReason) #ifdef LINK_LIBMHSTCAN return true; #else - static bool symbolsResolved = resolveSymbols(mhstcanLibrary()); + static bool symbolsResolved = resolveTinyCanSymbols(mhstcanLibrary()); if (Q_UNLIKELY(!symbolsResolved)) { *errorReason = mhstcanLibrary()->errorString(); return false; |