feat: Support both Qt5 and Qt6

REDasmOrg · Sep 8, 2023 · 5f1f9ec · 5f1f9ec
1 parent fc73e1c
commit 5f1f9ec
Show file tree

Hide file tree

Showing 23 changed files with 206 additions and 130 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: jurplel/install-qt-action@v3.3.0
 
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y build-essential gcc-10 g++-10 qt5-default libqt5x11extras5-dev cmake
+        sudo apt-get install -y build-essential gcc-10 g++-10 cmake
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10
         git submodule update --init --recursive
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.12)
 
 project(REDasm)
 
-set(_QT_VERSION_REQ 5.11)
-set(QT_VERSION_REQ "${_QT_VERSION_REQ}")
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
@@ -12,12 +10,15 @@ include(${CMAKE_SOURCE_DIR}/LibREDasm/cmake/sanitizers.cmake)
 
 string(TIMESTAMP REDASM_BUILD_TIMESTAMP "%Y%m%d")
 set(REDASM_GIT_VERSION "unknown")
-set(REDASM_VERSION_BASE "3.0-BETA6")
+set(REDASM_VERSION_BASE "3.0-BETA7")
 
 find_package(Git)
-find_package(Qt5 ${_QT_VERSION_REQ} REQUIRED COMPONENTS Widgets)
-#find_package(Qt5X11Extras ${_QT_VERSION_REQ} REQUIRED) # Needed for KDDockWidgets
-find_package(Qt5LinguistTools ${_QT_VERSION_REQ})
+find_package(Qt6 COMPONENTS Widgets)
+
+if(NOT Qt6_FOUND)
+    find_package(Qt5 REQUIRED COMPONENTS Widgets)
+    find_package(Qt5LinguistTools)
+endif()
 
 include(LibREDasm/cmake/CPM.cmake)
 
@@ -34,14 +35,21 @@ endif()
 set(REDASM_BUILD_VERSION "${REDASM_BUILD_TIMESTAMP}.${REDASM_GIT_VERSION}")
 add_definitions(-DREDASM_VERSION="${REDASM_VERSION_BASE} \(${REDASM_BUILD_VERSION}\)")
 
-set(KDDOCKWIDGETS_OPTIONS "KDDockWidgets_STATIC ON"
-                          "KDDockWidgets_EXAMPLES OFF"
-                          "KDDockWidgets_UNITY_BUILD OFF")
+if(Qt6_FOUND)
+    set(KDDOCKWIDGETS_OPTIONS "KDDockWidgets_QT6 ON"
+                              "KDDockWidgets_STATIC ON"
+                              "KDDockWidgets_EXAMPLES OFF"
+                              "KDDockWidgets_UNITY_BUILD OFF")
+else()
+    set(KDDOCKWIDGETS_OPTIONS "KDDockWidgets_STATIC ON"
+                              "KDDockWidgets_EXAMPLES OFF"
+                              "KDDockWidgets_UNITY_BUILD OFF")
+endif()
 
 CPMAddPackage(
-    NAME KDDockWidgetes
+    NAME KDDockWidgets
     GIT_REPOSITORY https://github.com/KDAB/KDDockWidgets
-    VERSION 1.4.0
+    VERSION 1.7.0
     OPTIONS ${KDDOCKWIDGETS_OPTIONS}
     EXCLUDE_FROM_ALL ON
     )
@@ -56,7 +64,7 @@ add_subdirectory(submodules/plugins)
 add_subdirectory(submodules/assemblers)
 add_subdirectory(submodules/loaders)
 add_subdirectory(submodules/database)
-qt5_wrap_ui(UI_HDRS ${UI_FILES})
+qt_wrap_ui(UI_HDRS ${UI_FILES})
 
 # Widgets
 file(GLOB_RECURSE WIDGETS_HEADERS CONFIGURE_DEPENDS widgets/*.h )
@@ -90,7 +98,6 @@ file(GLOB_RECURSE UI_SOURCES CONFIGURE_DEPENDS ui/*.cpp)
 file(GLOB_RECURSE UI_UIS CONFIGURE_DEPENDS ui/*.ui)
 
 SET(HEADERS
-    ${QHEXVIEW_HEADERS}
     ${REDASM_TEST_HEADERS}
     ${WIDGETS_HEADERS}
     ${DIALOGS_HEADERS}
@@ -105,7 +112,6 @@ SET(HEADERS
     redasmfonts.h)
 
 SET(SOURCES
-    ${QHEXVIEW_SOURCES}
     ${REDASM_TEST_SOURCES}
     ${WIDGETS_SOURCES}
     ${DIALOGS_SOURCES}
@@ -135,20 +141,21 @@ endif()
 
 set(ALL_SOURCES ${SOURCES} ${HEADERS} ${FORMS})
 
-if(Qt5LinguistTools_FOUND) # Prepare translations
+if(QtLinguistTools_FOUND) # Prepare translations
     message(STATUS "${PROJECT_NAME}: Adding multilanguage support")
-    qt5_create_translation(QM_FILES ${ALL_SOURCES} translations/redasm_en.ts)
+    qt_create_translation(QM_FILES ${ALL_SOURCES} translations/redasm_en.ts)
     configure_file(translations.qrc ${CMAKE_BINARY_DIR} COPYONLY)
     set(TRANSLATIONS_QRC ${CMAKE_BINARY_DIR}/translations.qrc)
 else()
     message(STATUS "${PROJECT_NAME}: Multilanguage support NOT available")
 endif()
 
-add_executable(${PROJECT_NAME} ${GUI_TYPE}
-               ${ALL_SOURCES} ${RESOURCES}
+add_executable(${PROJECT_NAME} ${GUI_TYPE} ${RESOURCES}
                ${TRANSLATIONS_QRC} ${QM_FILES}
                "${CMAKE_SOURCE_DIR}/res/windows/resources.rc")
 
+target_sources(${PROJECT_NAME} PRIVATE ${ALL_SOURCES})
+
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
 set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
 
@@ -159,11 +166,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE
         libs)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Widgets
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
     KDAB::kddockwidgets
-    qhexview-lib
+    QHexView
     LibREDasm)
 
 # Include Threads
@@ -181,16 +188,16 @@ set(REDASM_DEPLOY_DIR ${CMAKE_BINARY_DIR}/deploy)
 
 # Deploy Qt DLLs on Windows
 # https://stackoverflow.com/a/41199492/1806760
-if(Qt5_FOUND AND WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt)
-    get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)
+if(Qt_FOUND AND WIN32 AND TARGET Qt::qmake AND NOT TARGET Qt::windeployqt)
+    get_target_property(_qt_qmake_location Qt::qmake IMPORTED_LOCATION)
 
     execute_process(
-        COMMAND "${_qt5_qmake_location}" -query QT_INSTALL_PREFIX
+        COMMAND "${_qt_qmake_location}" -query QT_INSTALL_PREFIX
         RESULT_VARIABLE return_code
-        OUTPUT_VARIABLE qt5_install_prefix
+        OUTPUT_VARIABLE qt_install_prefix
         OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    set(_WINDEPLOYQT_EXECUTABLE "${qt5_install_prefix}/bin/windeployqt.exe")
+    set(_WINDEPLOYQT_EXECUTABLE "${qt_install_prefix}/bin/windeployqt.exe")
 
     if(EXISTS ${_WINDEPLOYQT_EXECUTABLE})
         set(WINDEPLOYQT_EXECUTABLE ${_WINDEPLOYQT_EXECUTABLE})

diff --git a/dialogs/devdialog/tabs/documenttab.cpp b/dialogs/devdialog/tabs/documenttab.cpp
@@ -113,7 +113,7 @@ QString DocumentTab::padHexDump(const QString& hexdump) const
     for(int i = 0; i < hexdump.size(); i += 2)
     {
         if(!phexdump.isEmpty()) phexdump += " ";
-        phexdump += hexdump.midRef(i, 2);
+        phexdump += hexdump.mid(i, 2);
     }
 
     return phexdump;

diff --git a/hooks/disassemblerhooks.cpp b/hooks/disassemblerhooks.cpp
@@ -422,7 +422,7 @@ void DisassemblerHooks::showDialog(const QString& title, QWidget* w)
 {
     QVBoxLayout* l = new QVBoxLayout();
     l->setSpacing(0);
-    l->setMargin(0);
+    l->setContentsMargins(0, 0, 0, 0);
     l->addWidget(w);
 
     QDialog* dialog = new QDialog();

diff --git a/hooks/disassemblerhooks.h b/hooks/disassemblerhooks.h
@@ -17,6 +17,7 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QFileInfo>
+#include <QMenu>
 #include <rdapi/rdapi.h>
 #include "isurface.h"
 
@@ -26,6 +27,22 @@ class OutputWidget;
 class DisassemblerDocks;
 class DockWidget;
 
+namespace REDasmCompat {
+
+template<typename Slot>
+inline QAction* addAction(QMenu* m, const QString& text, const QObject* object, Slot slot, const QKeySequence& shortcut) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return m->addAction(text, shortcut, object, slot);
+#else
+    return m->addAction(text, object, slot, shortcut);
+#endif
+}
+
+template<typename Slot>
+inline QAction* addAction(QMenu* m, const QString& text, const QObject* object, Slot slot) { return m->addAction(text, object, slot); }
+
+}
+
 class DisassemblerHooks: public QObject
 {
     Q_OBJECT

diff --git a/libs/qhexview b/libs/qhexview
diff --git a/models/dev/blocklistmodel.cpp b/models/dev/blocklistmodel.cpp
@@ -56,7 +56,7 @@ QVariant BlockListModel::data(const QModelIndex& index, int role) const
         if(index.column() == 3) return THEME_VALUE(Theme_Type);
         if(index.column() == 4) return THEME_VALUE(Theme_Label);
     }
-    else if(role == Qt::TextAlignmentRole) return (index.column() < 4) ? Qt::AlignCenter : (Qt::AlignLeft + Qt::AlignVCenter);
+    else if(role == Qt::TextAlignmentRole) return QVariant{(index.column() < 4) ? Qt::AlignCenter : (Qt::AlignLeft | Qt::AlignVCenter)};
 
     return QVariant();
 }

diff --git a/models/functionsmodel.cpp b/models/functionsmodel.cpp
@@ -26,8 +26,8 @@ QVariant FunctionsModel::data(const QModelIndex& index, int role) const
     }
     else if(role == Qt::TextAlignmentRole)
     {
-        if(index.column() == 0) return Qt::AlignRight + Qt::AlignVCenter;
-        if(index.column() == 1) return Qt::AlignLeft + Qt::AlignVCenter;
+        if(index.column() == 0) return QVariant{Qt::AlignRight | Qt::AlignVCenter};
+        if(index.column() == 1) return QVariant{Qt::AlignLeft | Qt::AlignVCenter};
     }
     else if((role == Qt::ForegroundRole) && (index.column() == 0))
        return THEME_VALUE(Theme_Address);

diff --git a/models/gotomodel.cpp b/models/gotomodel.cpp
@@ -28,8 +28,8 @@ QVariant GotoModel::data(const QModelIndex &index, int role) const
     }
     else if(role == Qt::TextAlignmentRole)
     {
-        if(index.column() == 0) return Qt::AlignRight + Qt::AlignVCenter;
-        if(index.column() == 1) return Qt::AlignLeft + Qt::AlignVCenter;
+        if(index.column() == 0) return QVariant{Qt::AlignRight | Qt::AlignVCenter};
+        if(index.column() == 1) return QVariant{Qt::AlignLeft | Qt::AlignVCenter};
     }
     else if((role == Qt::ForegroundRole) && (index.column() == 0))
         return THEME_VALUE(Theme_Address);

diff --git a/models/labelsmodel.cpp b/models/labelsmodel.cpp
@@ -62,7 +62,7 @@ QVariant LabelsModel::data(const QModelIndex& index, int role) const
         }
     }
     else if(role == Qt::ForegroundRole) return (index.column() == 0) ? THEME_VALUE(Theme_Address) : QVariant();
-    else if(role == Qt::TextAlignmentRole) return (index.column() < 3) ? Qt::AlignCenter + Qt::AlignVCenter : Qt::AlignLeft + Qt::AlignVCenter;
+    else if(role == Qt::TextAlignmentRole) return QVariant{(index.column() < 3) ? (Qt::AlignCenter | Qt::AlignVCenter) : (Qt::AlignLeft | Qt::AlignVCenter)};
 
     return QVariant();
 }

diff --git a/models/referencesmodel.cpp b/models/referencesmodel.cpp
@@ -66,8 +66,8 @@ QVariant ReferencesModel::data(const QModelIndex &index, int role) const
     }
     else if(role == Qt::TextAlignmentRole)
     {
-        if(index.column() == 0) return Qt::AlignRight + Qt::AlignVCenter;
-        if(index.column() == 3) return Qt::AlignLeft + Qt::AlignVCenter;
+        if(index.column() == 0) return QVariant{Qt::AlignRight | Qt::AlignVCenter};
+        if(index.column() == 3) return QVariant{Qt::AlignLeft | Qt::AlignVCenter};
         return Qt::AlignCenter;
     }
     else if((role == Qt::ForegroundRole) && (index.column() == 0))

diff --git a/models/segmentsmodel.cpp b/models/segmentsmodel.cpp
@@ -43,8 +43,8 @@ QVariant SegmentsModel::data(const QModelIndex &index, int role) const
     }
     else if(role == Qt::TextAlignmentRole)
     {
-        if(index.column() == 0) return Qt::AlignRight + Qt::AlignVCenter;
-        if(index.column() == 7) return Qt::AlignLeft + Qt::AlignVCenter;
+        if(index.column() == 0) return QVariant{Qt::AlignRight | Qt::AlignVCenter};
+        if(index.column() == 7) return QVariant{Qt::AlignLeft | Qt::AlignVCenter};
         return Qt::AlignCenter;
     }
 

diff --git a/models/stringsmodel.cpp b/models/stringsmodel.cpp
@@ -15,8 +15,8 @@ QVariant StringsModel::data(const QModelIndex& index, int role) const
     }
     else if(role == Qt::TextAlignmentRole)
     {
-        if(index.column() == 0) return Qt::AlignRight + Qt::AlignVCenter;
-        if(index.column() == 2) return Qt::AlignLeft + Qt::AlignVCenter;
+        if(index.column() == 0) return QVariant{Qt::AlignRight | Qt::AlignVCenter};
+        if(index.column() == 2) return QVariant{Qt::AlignLeft | Qt::AlignVCenter};
         return Qt::AlignCenter;
     }
     else if(role == Qt::ForegroundRole)

diff --git a/redasmfonts.h b/redasmfonts.h
@@ -42,7 +42,7 @@ class REDasmFonts
 
 #define FA_FONT                     REDasmFonts::instance()->faFont()
 #define FAB_FONT                    REDasmFonts::instance()->faBrandsFont()
-#define FA_ICON(code)               REDasmFonts::instance()->icon(code)
-#define FA_ICON_COLOR(code, color)  REDasmFonts::instance()->icon(code, color)
-#define FAB_ICON(code)              REDasmFonts::instance()->brand(code)
-#define FAB_ICON_COLOR(code, color) REDasmFonts::instance()->brand(code, color)
+#define FA_ICON(code)               REDasmFonts::instance()->icon(QChar{code})
+#define FA_ICON_COLOR(code, color)  REDasmFonts::instance()->icon(QChar{code}, color)
+#define FAB_ICON(code)              REDasmFonts::instance()->brand(QChar{code})
+#define FAB_ICON_COLOR(code, color) REDasmFonts::instance()->brand(QChar{code}, color)
diff --git a/redasmsettings.cpp b/redasmsettings.cpp
@@ -58,7 +58,7 @@ int REDasmSettings::currentFontSize() const
     int size = qApp->font().pixelSize();
 
     if(size == -1)
-        size = qApp->fontMetrics().height();
+        size = QFontMetrics{qApp->font()}.height();
 
     return this->value("selected_font_size", size).toInt();
 }