From 9c9bafa1e293d8024a4a1ef750c8578509b6b711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Fri, 14 Feb 2025 20:32:37 +0100 Subject: [PATCH] gui: updated qhexview component revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bartłomiej Burdukiewicz --- .gitmodules | 2 +- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 -- src/main-window.cpp | 4 ++-- src/submodules/qhexview | 1 - submodules/qhexview | 1 + 6 files changed, 6 insertions(+), 8 deletions(-) delete mode 160000 src/submodules/qhexview create mode 160000 submodules/qhexview diff --git a/.gitmodules b/.gitmodules index 64144e0..530103c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "src/submodules/qhexview"] - path = src/submodules/qhexview + path = submodules/qhexview url = https://github.com/Dax89/QHexView.git [submodule "formatter"] path = formatter diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c9ea30..5f38f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,8 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) -add_compile_definitions("-D__cpp_concepts=202002L") -find_package(Qt6 COMPONENTS Widgets Core Qsci) +find_package(Qt6 COMPONENTS Widgets Core) find_path(QSCI_INCLUDE_DIR NAMES qt6/Qsci/qsciscintilla.h) find_library(QSCI_LIBRARY NAMES qscintilla2_qt6) @@ -65,3 +64,4 @@ add_custom_target(docker include(CPack) +add_subdirectory("submodules/qhexview") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1e76bc3..7c8eadf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,5 @@ configure_file(config.h.in config.h) -add_subdirectory("submodules/qhexview") - file(GLOB_RECURSE fdt-viewer-headers *.hpp) file(GLOB_RECURSE fdt-viewer-sources *.cpp) file(GLOB_RECURSE fdt-viewer-uis *.ui) diff --git a/src/main-window.cpp b/src/main-window.cpp index f14436f..936d838 100644 --- a/src/main-window.cpp +++ b/src/main-window.cpp @@ -20,8 +20,8 @@ #include #include -#include "submodules/qhexview/model/buffer/qmemorybuffer.h" -#include "submodules/qhexview/qhexview.h" +#include "QHexView/qhexview.h" +#include "QHexView/model/buffer/qmemorybuffer.h" using namespace Window; diff --git a/src/submodules/qhexview b/src/submodules/qhexview deleted file mode 160000 index 06136db..0000000 --- a/src/submodules/qhexview +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 06136db4f20d0ef49d3565587109fd50d092caaa diff --git a/submodules/qhexview b/submodules/qhexview new file mode 160000 index 0000000..954cda3 --- /dev/null +++ b/submodules/qhexview @@ -0,0 +1 @@ +Subproject commit 954cda3ef9d0bf341fe7f6b4e49ca91200a84d2f