From 800a8daf11837e9f0a62c10887988eb4a12441b1 Mon Sep 17 00:00:00 2001 From: Scott Furry Date: Sat, 4 May 2019 22:52:34 -0600 Subject: [PATCH] Normalize qhexedit.h include path Include path used for QHexEdit in EditDialog.cpp is "implementation specific" to how DB4S uses the QHexEdit library. Change is to make usage of library more generic. --- CMakeLists.txt | 3 ++- src/EditDialog.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a59d9a..a9afd18d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,7 @@ else() find_package(QCustomPlot) endif() set(QHEXEDIT_DIR libs/qhexedit) +set(QHEXEDIT_INCL_DIR ${QHEXEDIT_DIR}/src) set(JSON_DIR libs/json) if(NOT ANTLR2_FOUND) @@ -360,7 +361,7 @@ endif() include_directories( "${CMAKE_CURRENT_BINARY_DIR}" - ${QHEXEDIT_DIR} + ${QHEXEDIT_INCL_DIR} ${JSON_DIR} ${ADDITIONAL_INCLUDE_PATHS} src) diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp index aa29c785..6a36c6e3 100644 --- a/src/EditDialog.cpp +++ b/src/EditDialog.cpp @@ -2,7 +2,7 @@ #include "ui_EditDialog.h" #include "sqlitedb.h" #include "Settings.h" -#include "src/qhexedit.h" +#include "qhexedit.h" #include "docktextedit.h" #include "FileDialog.h" #include "Data.h"