Merge pull request #2 from KunYi/master

fix build error, missed std::memcpy function
YuzukiTsuru · Aug 5, 2023 · 5a76f55 · 5a76f55
2 parents b72c4f0 + aee7efb
commit 5a76f55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/lib/QHexView/QHexView.cpp b/src/lib/QHexView/QHexView.cpp
@@ -23,7 +23,7 @@ QHexView::QHexView(QWidget *parent) :
         m_pdata(NULL) {
     setFont(QFont("Courier", 10));
 
-#if QT_VERSION >= 0x051100
+#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
     m_charWidth = fontMetrics().horizontalAdvance(QLatin1Char('9'));
 #else
     m_charWidth = fontMetrics().width(QLatin1Char('9'));
@@ -100,7 +100,7 @@ QSize QHexView::fullSize() const {
 }
 
 void QHexView::updatePositions() {
-#if QT_VERSION >= 0x051100
+#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
     m_charWidth = fontMetrics().horizontalAdvance(QLatin1Char('9'));
 #else
     m_charWidth = fontMetrics().width(QLatin1Char('9'));
@@ -532,4 +532,4 @@ QByteArray QHexView::DataStorageFile::getData(std::size_t position, std::size_t
 
 std::size_t QHexView::DataStorageFile::size() {
     return m_file.size();
-}
+}
diff --git a/src/spi_nand.cpp b/src/spi_nand.cpp
@@ -14,6 +14,7 @@
 
 #include <QMessageBox>
 #include <QFontDatabase>
+#include <cstring>
 
 #include "spi_nand.h"
 #include "x.h"