diff --git a/Analyser/ImageDecoder.h b/Analyser/ImageDecoder.h index b35ad51..3ebf567 100644 --- a/Analyser/ImageDecoder.h +++ b/Analyser/ImageDecoder.h @@ -1,6 +1,7 @@ #ifndef __IMAGEDECODER_H__ #define __IMAGEDECODER_H__ +#include #include #include #include diff --git a/Analyser/qml/Main.qml b/Analyser/qml/Main.qml index 31b8978..abbb9a3 100644 --- a/Analyser/qml/Main.qml +++ b/Analyser/qml/Main.qml @@ -7,7 +7,7 @@ import Analyser Window { id: window width: 1120 - height: 630 + height: 650 visible: true title: qsTr(Qt.application.name + " " + Qt.application.version) diff --git a/Peripheral/CdcUpdater.cpp b/Peripheral/CdcUpdater.cpp index 9bd5e57..839c83b 100644 --- a/Peripheral/CdcUpdater.cpp +++ b/Peripheral/CdcUpdater.cpp @@ -46,8 +46,11 @@ void CdcUpdater::start(const QString &path, const QSerialPortInfo &info) { } else { open(info); } - +#ifdef Q_OS_WINDOWS m_path = Amass::StringUtility::UTF8ToGBK(path.toStdString()); +#else + m_path = path.toStdString(); +#endif LOG(info) << "ota file: " << m_path; emit progressChanged(++m_progress); }