try switching the mac CI to qt6; remove the cmake hardcoded deploy, u…

…se macdeployqt instead

.github/workflows/build_macos.yml

@@ -26,6 +26,9 @@ jobs:
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
+        with:
+          version: 6.6.1
+          modules: qt5compat qtmultimedia
 
       - name: Install other prerequisites
         run: |
@@ -51,6 +54,11 @@ jobs:
           cd build
           cmake --install .
 
+      - name: Deployt Qt
+        run: |
+          cd '${{github.workspace}}\build'
+          macdeployqt "build/KVIrc.app"; if (!$?) { exit 1 }
+
       - name: Detect version
         shell: bash
         run: |

src/kvirc/CMakeLists.txt

@@ -270,6 +270,10 @@ endif()
 
 target_link_libraries(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS} ${qt_kvirc_modules})
 
+if(APPLE)
+	set_target_properties(${KVIRC_BINARYNAME} PROPERTIES MACOSX_BUNDLE TRUE)
+endif()
+
 if(MINGW)
 	# For some reason CMake doesn't do this itself...
 	# In case of MSVC, it does add /implib:kvirc.lib though
@@ -306,37 +310,9 @@ if(MSVC)
 endif()
 
 if(APPLE)
-	set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Plugins)
 	set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Resources)
-	#fixme dirty hack
-	set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
-	set(QT_LIBRARY_DIR "${Qt5Widgets_DIR}/../../")
-	get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
-	get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
-
-    # qt5: audio, iconengines, imageformats, mediaservice, platforms, sqldrivers
-    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        FILES_MATCHING
-        PATTERN "*.dSYM" EXCLUDE
-        PATTERN "*_debug.dylib" EXCLUDE
-        PATTERN "audio/*.dylib"
-        PATTERN "iconengines/*.dylib"
-        PATTERN "imageformats/*.dylib"
-        PATTERN "mediaservice/*.dylib"
-        PATTERN "platforms/*.dylib"
-        PATTERN "sqldrivers/*.dylib"
-    )
-
 	install(CODE "
 	    file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]
 Plugins = Plugins\")
 	    " COMPONENT Runtime)
-
-	install(CODE "
-	    file(GLOB_RECURSE QTPLUGINS
-	      \"${plugin_dest_dir}/*.dylib\")
-	    set(BU_CHMOD_BUNDLE_ITEMS ON)
-	    include(BundleUtilities)
-	    fixup_bundle(\"${CMAKE_INSTALL_PREFIX}\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\" IGNORE_ITEM \"Python;libqsqlodbc.dylib;libqsqlpsql.dylib\")
-	    " COMPONENT Runtime)
 endif()

src/modules/CMakeLists.txt

@@ -54,9 +54,4 @@ endif()
 
 if(COMPILE_ENCHANT_SUPPORT)
 	subdirs(spellchecker)
-endif()
-
-if(APPLE)
-	# This is a dirty trick ensure we get some code executed after the last module gets installed
-	subdirs(zzz_afterlastmodule)
-endif()
+endif()