diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-16 09:12:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-16 09:47:42 +0100 |
| commit | 23ef4bab1faa867ba3614f0b5a325dc3a91550a1 (patch) | |
| tree | c1f776ad4792bb8e3ce3688f509cb47cadbd006c /src/plugins/canbus/peakcan | |
| parent | a31a7e0b2b7b3de3e1867ad954ac7fad9531cc99 (diff) | |
| parent | 498b1424ce273beed02c5e1c93ed0ffd610624b8 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/canbus/peakcan/main.cpp
src/plugins/canbus/tinycan/main.cpp
src/serialbus/qcanbusframe.h
Change-Id: I7a38350688086b5f5cd7072acccb3fa38af76f88
Diffstat (limited to 'src/plugins/canbus/peakcan')
| -rw-r--r-- | src/plugins/canbus/peakcan/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp index d4886a9..00b4d36 100644 --- a/src/plugins/canbus/peakcan/main.cpp +++ b/src/plugins/canbus/peakcan/main.cpp @@ -55,7 +55,7 @@ public: { QString errorReason; if (!PeakCanBackend::canCreate(&errorReason)) { - qWarning("%s", qUtf8Printable(errorReason)); + qWarning("%ls", qUtf16Printable(errorReason)); if (errorMessage) *errorMessage = errorReason; return nullptr; |