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:15 +0200 |
| commit | 77ccec69263567b2b41244e483dfb083b883c6d8 (patch) | |
| tree | 9760fffdbaac069887b0ed1100299c71ad118f5c /src/plugins/canbus/peakcan | |
| parent | 38def2c0817291c09c440c074f011c4f684eaccf (diff) | |
| parent | c085d7dae290de177c6cfa5d882233d3124991db (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1
Diffstat (limited to 'src/plugins/canbus/peakcan')
| -rw-r--r-- | src/plugins/canbus/peakcan/peakcan_symbols_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/canbus/peakcan/peakcan_symbols_p.h b/src/plugins/canbus/peakcan/peakcan_symbols_p.h index 3470df2..12de76f 100644 --- a/src/plugins/canbus/peakcan/peakcan_symbols_p.h +++ b/src/plugins/canbus/peakcan/peakcan_symbols_p.h @@ -335,7 +335,7 @@ GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetValue, TPCANHandle, TPCANParameter, GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_SetValue, TPCANHandle, TPCANParameter, void *, TPCANLong) GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetErrorText, TPCANStatus, quint16, char *) -inline bool resolveSymbols(QLibrary *pcanLibrary) +inline bool resolvePeakCanSymbols(QLibrary *pcanLibrary) { if (!pcanLibrary->isLoaded()) { #ifdef Q_OS_MACOS diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index b1a991d..16232f8 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)) { qCCritical(QT_CANBUS_PLUGINS_PEAKCAN, "Cannot load library: %ls", qUtf16Printable(pcanLibrary()->errorString())); |