summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:01:09 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:01:15 +0200
commit77ccec69263567b2b41244e483dfb083b883c6d8 (patch)
tree9760fffdbaac069887b0ed1100299c71ad118f5c
parent38def2c0817291c09c440c074f011c4f684eaccf (diff)
parentc085d7dae290de177c6cfa5d882233d3124991db (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1
-rw-r--r--src/plugins/canbus/peakcan/peakcan_symbols_p.h2
-rw-r--r--src/plugins/canbus/peakcan/peakcanbackend.cpp2
-rw-r--r--src/plugins/canbus/systeccan/systeccan_symbols_p.h2
-rw-r--r--src/plugins/canbus/systeccan/systeccanbackend.cpp2
-rw-r--r--src/plugins/canbus/tinycan/tinycan_symbols_p.h2
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.cpp2
-rw-r--r--src/plugins/canbus/vectorcan/vectorcan_symbols_p.h2
-rw-r--r--src/plugins/canbus/vectorcan/vectorcanbackend.cpp2
8 files changed, 8 insertions, 8 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()));
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
diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp
index 0663f39..a7de557 100644
--- a/src/plugins/canbus/systeccan/systeccanbackend.cpp
+++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp
@@ -55,7 +55,7 @@ Q_GLOBAL_STATIC(QLibrary, systecLibrary)
bool SystecCanBackend::canCreate(QString *errorReason)
{
- static bool symbolsResolved = resolveSymbols(systecLibrary());
+ static bool symbolsResolved = resolveSystecCanSymbols(systecLibrary());
if (Q_UNLIKELY(!symbolsResolved)) {
*errorReason = systecLibrary()->errorString();
return false;
diff --git a/src/plugins/canbus/tinycan/tinycan_symbols_p.h b/src/plugins/canbus/tinycan/tinycan_symbols_p.h
index 44dffd6..625edd3 100644
--- a/src/plugins/canbus/tinycan/tinycan_symbols_p.h
+++ b/src/plugins/canbus/tinycan/tinycan_symbols_p.h
@@ -317,7 +317,7 @@ GENERATE_SYMBOL_VARIABLE(void, CanSetRxEventCallback, CanRxEventCallback)
GENERATE_SYMBOL_VARIABLE(void, CanSetEvents, quint16)
GENERATE_SYMBOL_VARIABLE(quint32, CanEventStatus, void)
-inline bool resolveSymbols(QLibrary *mhstcanLibrary)
+inline bool resolveTinyCanSymbols(QLibrary *mhstcanLibrary)
{
if (!mhstcanLibrary->isLoaded()) {
mhstcanLibrary->setFileName(QStringLiteral("mhstcan"));
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 411b917..606927c 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -62,7 +62,7 @@ bool TinyCanBackend::canCreate(QString *errorReason)
#ifdef LINK_LIBMHSTCAN
return true;
#else
- static bool symbolsResolved = resolveSymbols(mhstcanLibrary());
+ static bool symbolsResolved = resolveTinyCanSymbols(mhstcanLibrary());
if (Q_UNLIKELY(!symbolsResolved)) {
*errorReason = mhstcanLibrary()->errorString();
return false;
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;