Skip to content

Commit

Permalink
gui: updated qhexview component revision
Browse files Browse the repository at this point in the history
Signed-off-by: Bartłomiej Burdukiewicz <[email protected]>
  • Loading branch information
dev-0x7C6 committed Feb 14, 2025
1 parent 5a783f7 commit 9c9bafa
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -65,3 +64,4 @@ add_custom_target(docker

include(CPack)

add_subdirectory("submodules/qhexview")
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/main-window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <Qsci/qscilexercpp.h>
#include <Qsci/qsciscintilla.h>

#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;

Expand Down
1 change: 0 additions & 1 deletion src/submodules/qhexview
Submodule qhexview deleted from 06136d
1 change: 1 addition & 0 deletions submodules/qhexview
Submodule qhexview added at 954cda

0 comments on commit 9c9bafa

Please sign in to comment.