diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 18:30:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 18:33:32 +0100 |
| commit | 55632d600076aa934663598ddb462ae122958685 (patch) | |
| tree | 19a54c0c8ac4cab1e29e85827d893df817473e9b /src/plugins/canbus/peakcan | |
| parent | bd1fb0a6aa2a7522fe2d1b0c21e3523eb75231d5 (diff) | |
| parent | bb999860c46757d9afd6c36fdba11ebe96caccc1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
examples/serialbus/can/mainwindow.cpp
Change-Id: I8d821a832bc5bf966230b4f66f0113929b3114dc
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; |