migrate to QT6

segrax · segrax · commit f55e5ceb6a48 · 2026-01-06T07:12:51.000+11:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,32 @@
+name: build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Cache vcpkg
+        uses: actions/cache@v4
+        with:
+          path: |
+            vcpkg_installed
+            Project/third_party/vcpkg
+            Project/third_party/vcpkg/downloads
+            Project/third_party/vcpkg/archives
+          key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
+
+      - name: Build (Release x64)
+        shell: pwsh
+        run: |
+          .\Project\build_vs.cmd x64 Release
+
+      - name: Upload Run artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: editor-run
+          path: Run/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS
     "${CMAKE_CURRENT_LIST_DIR}/Source/Dialogs"
 )
 
-find_package(Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Widgets)
 
 if(WIN32)
     include(FetchContent)
@@ -266,6 +266,15 @@ set_target_properties(editor PROPERTIES
     VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/Run"
 )
 
+if(WIN32)
+    set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT editor)
+
+    # Rely on windeployqt instead of vcpkg applocal for Qt deployment.
+    set(VCPKG_APPLOCAL_DEPS OFF CACHE BOOL "" FORCE)
+    set_target_properties(editor PROPERTIES VCPKG_APPLOCAL_DEPS OFF)
+    set_property(TARGET editor PROPERTY VS_GLOBAL_VcpkgApplocalDeps "false")
+endif()
+
 target_include_directories(editor PRIVATE
     .
     Source
@@ -281,7 +290,7 @@ target_compile_definitions(editor PRIVATE
 )
 
 target_link_libraries(editor PRIVATE
-    Qt5::Widgets
+    Qt6::Widgets
     SDL3::SDL3
     SDL3_mixer::SDL3_mixer
 )
@@ -300,21 +309,56 @@ if(WIN32)
         list(APPEND _runtime_dlls $<TARGET_FILE:SDL3_mixer-shared>)
     endif()
 
-    if(TARGET Qt5::Widgets)
-        list(APPEND _runtime_dlls $<TARGET_FILE:Qt5::Widgets>)
-    endif()
-    if(TARGET Qt5::Gui)
-        list(APPEND _runtime_dlls $<TARGET_FILE:Qt5::Gui>)
-    endif()
-    if(TARGET Qt5::Core)
-        list(APPEND _runtime_dlls $<TARGET_FILE:Qt5::Core>)
-    endif()
-
     if(_runtime_dlls)
         add_custom_command(TARGET editor POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
                 ${_runtime_dlls}
                 "${CMAKE_CURRENT_LIST_DIR}/Run"
             COMMENT "Copy runtime DLLs to Run")
     endif()
+
+    if(TARGET Qt6::qmake)
+        get_target_property(_qt6_qmake Qt6::qmake IMPORTED_LOCATION)
+        get_filename_component(_qt6_bin_dir "${_qt6_qmake}" DIRECTORY)
+        set(_qt6_windeployqt "${_qt6_bin_dir}/windeployqt.exe")
+        if(EXISTS "${_qt6_windeployqt}")
+            if(DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
+                set(_qt6_debug_bin "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin")
+                set(_qt6_release_bin "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+                set(_qt6_debug_plugins "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/Qt6/plugins")
+                set(_qt6_release_plugins "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/Qt6/plugins")
+            endif()
+            add_custom_command(TARGET editor POST_BUILD
+                COMMAND ${CMAKE_COMMAND}
+                    -DDEPLOY_CONFIG=$<CONFIG>
+                    -DWINDEPLOYQT="${_qt6_windeployqt}"
+                    -DRUN_DIR="${CMAKE_CURRENT_LIST_DIR}/Run"
+                    -DTARGET_EXE="$<TARGET_FILE:editor>"
+                    -DQT_DEBUG_BIN="${_qt6_debug_bin}"
+                    -DQT_RELEASE_BIN="${_qt6_release_bin}"
+                    -DQT_BIN_DIR="${_qt6_bin_dir}"
+                    -P "${CMAKE_CURRENT_LIST_DIR}/cmake/windeployqt.cmake"
+                COMMENT "Run windeployqt for editor")
+        endif()
+    endif()
+
+    if(DEFINED _qt6_debug_bin AND DEFINED _qt6_debug_plugins)
+        add_custom_command(TARGET editor POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_LIST_DIR}/Run/platforms"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${_qt6_debug_bin}/Qt6Cored.dll"
+                "${_qt6_debug_bin}/Qt6Guid.dll"
+                "${_qt6_debug_bin}/Qt6Widgetsd.dll"
+                "${CMAKE_CURRENT_LIST_DIR}/Run"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${_qt6_debug_plugins}/platforms/qwindowsd.dll"
+                "${CMAKE_CURRENT_LIST_DIR}/Run/platforms"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${_qt6_debug_bin}/Qt6Cored.dll"
+                "${_qt6_debug_bin}/Qt6Guid.dll"
+                "${_qt6_debug_bin}/Qt6Widgetsd.dll"
+                "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin"
+            COMMENT "Copy Qt debug DLLs and platform plugin"
+            CONFIGURATIONS Debug)
+    endif()
 endif()
diff --git a/Project/build_vs.cmd b/Project/build_vs.cmd
@@ -4,6 +4,7 @@ setlocal
 set "ROOT_DIR=%~dp0.."
 set "BUILD_DIR=%~dp0VS"
 set "GENERATOR=Visual Studio 17 2022"
+set "VCPKG_BUILD_TYPE="
 
 if "%~1"=="" (
     set "PLATFORM=x64"
@@ -82,6 +83,7 @@ if not exist "%VCPKG_ROOT%\vcpkg.exe" (
 )
 
 set "VCPKG_TOOLCHAIN=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake"
+set "VCPKG_INSTALLED_DIR=%ROOT_DIR%\vcpkg_installed"
 
 if exist "%VCPKG_ROOT%\vcpkg.exe" (
     "%VCPKG_ROOT%\vcpkg.exe" install --triplet %VCPKG_TRIPLET%
@@ -97,7 +99,7 @@ if exist "%BUILD_DIR%\CMakeCache.txt" (
 )
 
 if exist "%VCPKG_TOOLCHAIN%" (
-    cmake -S "%ROOT_DIR%" -B "%BUILD_DIR%" -G "%GENERATOR%" -A "%PLATFORM%" -DCMAKE_TOOLCHAIN_FILE="%VCPKG_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET%
+    cmake -S "%ROOT_DIR%" -B "%BUILD_DIR%" -G "%GENERATOR%" -A "%PLATFORM%" -DCMAKE_TOOLCHAIN_FILE="%VCPKG_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DVCPKG_INSTALLED_DIR="%VCPKG_INSTALLED_DIR%"
 ) else (
     cmake -S "%ROOT_DIR%" -B "%BUILD_DIR%" -G "%GENERATOR%" -A "%PLATFORM%"
 )
diff --git a/Source/Dialogs/CampaignDialog.cpp b/Source/Dialogs/CampaignDialog.cpp
@@ -1,10 +1,10 @@
 #include "stdafx_ofed.hpp"
 #include "ofed.hpp"
-#include<qlineedit.h>
+#include <QLineEdit>
 
 #include "ui_CampaignDialog.h"
-#include <qevent.h>
-#include <qshortcut.h>
+#include <QEvent>
+#include <QShortcut>
 
 cCampaignDialog::cCampaignDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
 
diff --git a/Source/Dialogs/CampaignDialog.hpp b/Source/Dialogs/CampaignDialog.hpp
@@ -12,7 +12,7 @@ class cCampaignDialog : public QDialog {
 
 
 public:
-    cCampaignDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+    cCampaignDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
     ~cCampaignDialog();
 
     void accept() override;
diff --git a/Source/Dialogs/MapView.cpp b/Source/Dialogs/MapView.cpp
@@ -2,9 +2,9 @@
 #include "ofed.hpp"
 #include "ui_MapView.h"
 
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qevent.h>
+#include <QPixmap>
+#include <QPainter>
+#include <QEvent>
 
 cMapView::cMapView( QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
 
diff --git a/Source/Dialogs/MapView.hpp b/Source/Dialogs/MapView.hpp
@@ -12,7 +12,7 @@ class cMapView : public QDialog {
 	void paintEvent(QPaintEvent* e) override;
 
 public:
-	cMapView( QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+	cMapView( QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 	~cMapView();
 
 	void RenderTiles();
diff --git a/Source/Dialogs/NewMapDialog.hpp b/Source/Dialogs/NewMapDialog.hpp
@@ -4,7 +4,7 @@ class cNewMapDialog : public QDialog {
 	Ui_NewMapDialog *mUi;
 
 public:
-	cNewMapDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+	cNewMapDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 
 	void accept() override;
 	void reject() override;
diff --git a/Source/Dialogs/ToolboxSprites.cpp b/Source/Dialogs/ToolboxSprites.cpp
@@ -2,9 +2,9 @@
 #include "ofed.hpp"
 #include "ui_ToolboxSprites.h"
 
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qevent.h>
+#include <QPixmap>
+#include <QPainter>
+#include <QEvent>
 
 cToolboxSprites::cToolboxSprites(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
 
diff --git a/Source/Dialogs/ToolboxSprites.hpp b/Source/Dialogs/ToolboxSprites.hpp
@@ -31,7 +31,7 @@ class cToolboxSprites : public QDialog {
     void mouseMoveEvent(QMouseEvent *eventMove) override;
 
 public:
-	cToolboxSprites(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+	cToolboxSprites(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 	~cToolboxSprites();
 
 	void RenderSprites();
diff --git a/Source/Dialogs/ToolboxTiles.cpp b/Source/Dialogs/ToolboxTiles.cpp
@@ -2,9 +2,9 @@
 #include "ofed.hpp"
 #include "ui_ToolboxTiles.h"
 
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qevent.h>
+#include <QPixmap>
+#include <QPainter>
+#include <QEvent>
 
 cToolboxTiles::cToolboxTiles( QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
 
diff --git a/Source/Dialogs/ToolboxTiles.hpp b/Source/Dialogs/ToolboxTiles.hpp
@@ -16,7 +16,7 @@ class cToolboxTiles : public QDialog {
     void mouseMoveEvent(QMouseEvent *eventMove) override;
 
 public:
-	cToolboxTiles( QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+	cToolboxTiles( QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 	~cToolboxTiles();
 
 	void RenderTiles();
diff --git a/Source/Models/CampaignModel.cpp b/Source/Models/CampaignModel.cpp
@@ -96,7 +96,7 @@ void cCampaignModel::SetCampaign(cCampaign* pCampaign) {
 
 Qt::ItemFlags cCampaignModel::flags(const QModelIndex &index) const {
     if (!index.isValid())
-        return 0;
+        return Qt::NoItemFlags;
 
     return Qt::ItemIsEditable | QAbstractItemModel::flags(index);
 }
diff --git a/Source/Models/MissionModel.cpp b/Source/Models/MissionModel.cpp
@@ -111,7 +111,7 @@ std::shared_ptr<cMission> cMissionModel::GetMission() {
 
 Qt::ItemFlags cMissionModel::flags(const QModelIndex &index) const {
     if (!index.isValid())
-        return 0;
+        return Qt::NoItemFlags;
 
     return Qt::ItemIsEditable | QAbstractItemModel::flags(index);
 }
diff --git a/Source/OFED.cpp b/Source/OFED.cpp
@@ -3,8 +3,8 @@
 #include "ui_ToolboxTiles.h"
 #include "ui_CampaignDialog.h"
 
-#include <qpainter.h>
-#include <qscreen.h>
+#include <QPainter>
+#include <QScreen>
 #include <QFileDialog>
 #include <chrono>
 
diff --git a/Source/WindowQT.cpp b/Source/WindowQT.cpp
@@ -22,9 +22,9 @@
 
 #include "stdafx_ofed.hpp"
 #include "ofed.hpp"
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qevent.h>
+#include <QPixmap>
+#include <QPainter>
+#include <QEvent>
 
 
 cWindowQT::cWindowQT(QWidget* pParent) : QWidget(pParent), cWindow() {
@@ -98,7 +98,11 @@ void cWindowQT::paintEvent(QPaintEvent*) {
 	painter.drawImage( Dest, mSurface, Src);
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void cWindowQT::enterEvent(QEnterEvent*) {
+#else
 void cWindowQT::enterEvent(QEvent*) {
+#endif
 
 	mMouseInTimer.start(4);
 }
diff --git a/Source/WindowQT.hpp b/Source/WindowQT.hpp
@@ -21,6 +21,7 @@
  */
 
 class QEvent;
+class QEnterEvent;
 
 class cWindowQT : public QWidget, public cWindow {
 
@@ -43,8 +44,13 @@ class cWindowQT : public QWidget, public cWindow {
 	void				mouseMoveEvent(QMouseEvent *eventMove);
 	void				mousePressEvent(QMouseEvent *eventPress);
 	void				mouseReleaseEvent(QMouseEvent *releaseEvent);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	void				enterEvent(QEnterEvent* pEvent) override;
+	void				leaveEvent(QEvent* pEvent) override;
+#else
 	void				enterEvent(QEvent* pEvent) override;
 	void				leaveEvent(QEvent* pEvent) override;
+#endif
 
 public:
 						cWindowQT(QWidget* pParent);
diff --git a/Source/main.cpp b/Source/main.cpp
@@ -1,6 +1,6 @@
 
 #include "ofed.hpp"
-#include <QtWidgets/QApplication>
+#include <QApplication>
 
 cOFED* g_OFED;
 std::shared_ptr<sFodderParameters> g_Parameters;
@@ -17,4 +17,4 @@ int	start(int argc, char *argv[]) {
 	g_OFED->show();
 
 	return a.exec();
-}
+}
diff --git a/Source/ofed.hpp b/Source/ofed.hpp
@@ -50,7 +50,7 @@ class cOFED : public QMainWindow
 	void moveEvent(QMoveEvent *event);
 
 public:
-	cOFED(QWidget *parent = Q_NULLPTR);
+	cOFED(QWidget *parent = nullptr);
     ~cOFED();
 
 	void OpenFodder_Prepare();
diff --git a/Source/stdafx_ofed.hpp b/Source/stdafx_ofed.hpp
@@ -2,13 +2,13 @@
 #define _STDAFX_OFED
 
 
-#include <qimage.h>
-#include <qwidget.h>
-#include <qtimer.h>
-#include <qdialog.h>
-#include <QtWidgets/QMainWindow>
+#include <QImage>
+#include <QWidget>
+#include <QTimer>
+#include <QDialog>
+#include <QMainWindow>
 #include <QAbstractTableModel>
-#include <qlabel.h>
+#include <QLabel>
 #include <QEnterEvent>
 
 #include "stdafx.hpp"
diff --git a/cmake/windeployqt.cmake b/cmake/windeployqt.cmake
diff --git a/editor.pro b/editor.pro
diff --git a/vcpkg.json b/vcpkg.json

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ setlocal`
`4`	`4`	`set "ROOT_DIR=%~dp0.."`
`5`	`5`	`set "BUILD_DIR=%~dp0VS"`
`6`	`6`	`set "GENERATOR=Visual Studio 17 2022"`
	`7`	`+set "VCPKG_BUILD_TYPE="`
`7`	`8`
`8`	`9`	`if "%~1"=="" (`
`9`	`10`	`set "PLATFORM=x64"`
`@@ -82,6 +83,7 @@ if not exist "%VCPKG_ROOT%\vcpkg.exe" (`
`82`	`83`	`)`
`83`	`84`
`84`	`85`	`set "VCPKG_TOOLCHAIN=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake"`
	`86`	`+set "VCPKG_INSTALLED_DIR=%ROOT_DIR%\vcpkg_installed"`
`85`	`87`
`86`	`88`	`if exist "%VCPKG_ROOT%\vcpkg.exe" (`
`87`	`89`	`"%VCPKG_ROOT%\vcpkg.exe" install --triplet %VCPKG_TRIPLET%`
`@@ -97,7 +99,7 @@ if exist "%BUILD_DIR%\CMakeCache.txt" (`
`97`	`99`	`)`
`98`	`100`
`99`	`101`	`if exist "%VCPKG_TOOLCHAIN%" (`
`100`		`- cmake -S "%ROOT_DIR%" -B "%BUILD_DIR%" -G "%GENERATOR%" -A "%PLATFORM%" -DCMAKE_TOOLCHAIN_FILE="%VCPKG_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET%`
	`102`	`+ cmake -S "%ROOT_DIR%" -B "%BUILD_DIR%" -G "%GENERATOR%" -A "%PLATFORM%" -DCMAKE_TOOLCHAIN_FILE="%VCPKG_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DVCPKG_INSTALLED_DIR="%VCPKG_INSTALLED_DIR%"`
`101`	`103`	`) else (`
`102`	`104`	`cmake -S "%ROOT_DIR%" -B "%BUILD_DIR%" -G "%GENERATOR%" -A "%PLATFORM%"`
`103`	`105`	`)`