diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:02:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:02:54 +0200 |
| commit | 28f036d07e10b64cda1174dc31e99ab6d0b420b5 (patch) | |
| tree | 5a14c4d822dd4eec188aa44c4315125643038a92 /src/plugins/canbus/tinycan/tinycanbackend.cpp | |
| parent | feb670170250f24e3af0f7b368c7bf81087e09ff (diff) | |
| parent | 709d2a539089e9b0b2b07dcd29a6d770d44f2eba (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic389d438c9980212152e4ede298d80bd3eceae44
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; |