diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-02-13 21:51:24 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-02-17 07:23:00 +0000 |
| commit | 2f934cfb143df5fccdaab20b2982e54bb13a1bdf (patch) | |
| tree | 031b6206ffefae8131d0d3ea4a4e71e1cbeb9790 /src/plugins/canbus/vectorcan | |
| parent | 1f2f5b700b0e72785af46ae23775009cb55a1192 (diff) | |
VectorCAN: Load vxlapi64.dll for 64 bit builds
Task-number: QTBUG-58774
Change-Id: I9ac12dbb5ae267a063b3c60130ed86499bce22dc
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/vectorcan')
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan_symbols_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h index a2ab367..a267fa5 100644 --- a/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h +++ b/src/plugins/canbus/vectorcan/vectorcan_symbols_p.h @@ -458,7 +458,11 @@ GENERATE_SYMBOL_VARIABLE(char *, xlGetErrorString, XLstatus) inline bool resolveSymbols(QLibrary *vectorcanLibrary) { if (!vectorcanLibrary->isLoaded()) { +#ifdef Q_PROCESSOR_X86_64 + vectorcanLibrary->setFileName(QStringLiteral("vxlapi64")); +#else vectorcanLibrary->setFileName(QStringLiteral("vxlapi")); +#endif if (!vectorcanLibrary->load()) return false; } |