diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:01:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:01:09 +0200 |
| commit | c085d7dae290de177c6cfa5d882233d3124991db (patch) | |
| tree | 9760fffdbaac069887b0ed1100299c71ad118f5c /src/plugins/canbus/vectorcan | |
| parent | 38def2c0817291c09c440c074f011c4f684eaccf (diff) | |
| parent | 80144b89ca1adede0db9d6e485037f5e431216c3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I35dad8a57ea003c7d70f03651aa0604141c8b2db
Diffstat (limited to 'src/plugins/canbus/vectorcan')
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h index 8c1ad52..9d6e841 100644 --- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h +++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h @@ -477,7 +477,7 @@ GENERATE_SYMBOL_VARIABLE(XLstatus, xlSetNotification, XLportHandle, XLhandle *, GENERATE_SYMBOL_VARIABLE(XLstatus, xlCanRequestChipState, XLportHandle, XLaccess) GENERATE_SYMBOL_VARIABLE(char *, xlGetErrorString, XLstatus) -inline bool resolveSymbols(QLibrary *vectorcanLibrary) +inline bool resolveVectorCanSymbols(QLibrary *vectorcanLibrary) { if (!vectorcanLibrary->isLoaded()) { #ifdef Q_PROCESSOR_X86_64 diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index 9d3bdef..e071122 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -61,7 +61,7 @@ bool VectorCanBackend::canCreate(QString *errorReason) #ifdef LINK_LIBVECTORCAN return true; #else - static bool symbolsResolved = resolveSymbols(vectorcanLibrary()); + static bool symbolsResolved = resolveVectorCanSymbols(vectorcanLibrary()); if (Q_UNLIKELY(!symbolsResolved)) { *errorReason = vectorcanLibrary()->errorString(); return false; |