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/peakcan/peakcan_symbols_p.h | |
parent | feb670170250f24e3af0f7b368c7bf81087e09ff (diff) | |
parent | 709d2a539089e9b0b2b07dcd29a6d770d44f2eba (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic389d438c9980212152e4ede298d80bd3eceae44
Diffstat (limited to 'src/plugins/canbus/peakcan/peakcan_symbols_p.h')
-rw-r--r-- | src/plugins/canbus/peakcan/peakcan_symbols_p.h | 2 |
1 files changed, 1 insertions, 1 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 |