From 414c050330b35c8c6a61d3d462599636bcbbc2ac Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Sat, 10 Aug 2024 23:26:46 +0200
Subject: [PATCH] Update to newer Qt version (#3369)

---
 apps/OpenSpace/CMakeLists.txt                             | 3 +--
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp        | 2 +-
 apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index c4a1234cd0..8e41455eca 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -147,10 +147,9 @@ if (WIN32)
   # Find the windeployqt application
   get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION)
   get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
-  find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
   add_custom_command(
     TARGET OpenSpace POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
+    COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${_qt_bin_dir}/windeployqt6.exe" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
     COMMENT "Deploying Qt libraries"
   )
 endif ()
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 162d11b0d9..e9db214d84 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -224,7 +224,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
 
     qInstallMessageHandler(
         [](QtMsgType type, const QMessageLogContext&, const QString& msg) {
-            if (type == QtCriticalMsg || type == QtFatalMsg || type == QtSystemMsg) {
+            if (type == QtCriticalMsg || type == QtFatalMsg || type == QtCriticalMsg) {
                 std::cerr << msg.toStdString() << '\n';
             }
         }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
index 15a9b69e08..67690c8b33 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
@@ -151,7 +151,7 @@ bool AssetTreeItem::insertColumns(int position, int columns) {
         _itemData.insert(_itemData.begin() + position, QVariant());
     }
 
-    for (AssetTreeItem* child : qAsConst(_childItems)) {
+    for (AssetTreeItem* child : _childItems) {
         child->insertColumns(position, columns);
     }