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/systeccan/systeccan_symbols_p.h | |
| 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/systeccan/systeccan_symbols_p.h')
| -rw-r--r-- | src/plugins/canbus/systeccan/systeccan_symbols_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/systeccan/systeccan_symbols_p.h b/src/plugins/canbus/systeccan/systeccan_symbols_p.h index ce32422..037f994 100644 --- a/src/plugins/canbus/systeccan/systeccan_symbols_p.h +++ b/src/plugins/canbus/systeccan/systeccan_symbols_p.h @@ -303,7 +303,7 @@ GENERATE_SYMBOL_VARIABLE(UCANRET, UcanResetCan, tUcanHandle) GENERATE_SYMBOL_VARIABLE(UCANRET, UcanWriteCanMsgEx, tUcanHandle, quint8, tCanMsgStruct *, quint32 *) GENERATE_SYMBOL_VARIABLE(UCANRET, UcanGetStatus, tUcanHandle, tStatusStruct *) -inline bool resolveSymbols(QLibrary *systecLibrary) +inline bool resolveSystecCanSymbols(QLibrary *systecLibrary) { if (!systecLibrary->isLoaded()) { #ifdef Q_PROCESSOR_X86_64 |