compile for 6.4.2 debian bookworm and Ubuntu The Noble Numbat

Author: noisecode3

CMakeLists.txt

@@ -69,17 +69,26 @@ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure")
     )
 endif()
 if(EXISTS "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure")
-    message(STATUS "Running autoconf to prepare libbacktrace")
-    execute_process(
-        COMMAND bash "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure"
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/libs/libbacktrace"
-        RESULT_VARIABLE AUTOCONF_RESULT
-    )
-    if(NOT AUTOCONF_RESULT EQUAL 0)
-        message(
-            FATAL_ERROR
-            "Autoconf failed with exit code ${AUTOCONF_RESULT}"
+    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/libs/libbacktrace/Makefile")
+        message(STATUS "Running autoconf to prepare libbacktrace")
+        execute_process(
+            COMMAND bash "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure"
+            WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/libs/libbacktrace"
+            RESULT_VARIABLE AUTOCONF_RESULT
         )
+        if(NOT AUTOCONF_RESULT EQUAL 0)
+            message(
+                FATAL_ERROR
+                "Autoconf failed with exit code ${AUTOCONF_RESULT}"
+            )
+        endif()
+        if(UBUNTU)
+            execute_process(
+                COMMAND bash -c
+                "sed -i 's|^SHELL = /bin/sh$|SHELL = /bin/bash|' Makefile"
+                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/libs/libbacktrace"
+            )
+        endif()
     endif()
     execute_process(
         COMMAND make
@@ -176,13 +185,24 @@ set(INCLUDE_DIR
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(COMPILE_MICROS)
+
+if(UBUNTU)
+    list(APPEND COMPILE_MICROS
+        UBUNTU
+    )
+endif()
+
 if(TEST)
     enable_testing()
     set(SOURCES ${SOURCES_MC} ${SOURCES_TESTS})
     add_executable(${PROJECT_NAME}Test ${SOURCES})
     add_test(NAME ${PROJECT_NAME}Test COMMAND ${PROJECT_NAME}Test)
     target_link_libraries(${PROJECT_NAME}Test PUBLIC ${LINK_COMMON} Qt6::Test)
-    target_include_directories(${PROJECT_NAME}Test PRIVATE ${INCLUDE_DIR} test)
+    target_include_directories(${PROJECT_NAME}Test PRIVATE ${INCLUDE_DIR}
+        ${COMPILE_MICROS}
+        test
+    )
     target_compile_definitions(${PROJECT_NAME}Test PRIVATE TEST)
     set_target_properties(${PROJECT_NAME}Test PROPERTIES
         CXX_STANDARD 17
@@ -206,6 +226,7 @@ else()
     add_executable(${PROJECT_NAME} ${SOURCES})
     target_link_libraries(${PROJECT_NAME} PUBLIC ${LINK_COMMON} ${LINK_GUI})
     target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIR})
+    target_compile_definitions(${PROJECT_NAME} PRIVATE ${COMPILE_MICROS})
     set_target_properties(${PROJECT_NAME} PROPERTIES
         CXX_STANDARD 17
         CXX_STANDARD_REQUIRED ON

src/FileManager.cpp

@@ -19,7 +19,7 @@
 #include <QtCore>
 #include <QByteArray>
 #include <QDataStream>
-#include <QtLogging>
+#include <qlogging.h>
 #include "../miniz/miniz.h"  // IWYU pragma: keep
 #include "../miniz/miniz_zip.h"
 #include "../src/gameFileTreeData.hpp"

src/LevelViewList.cpp

@@ -195,65 +195,114 @@ bool LevelListProxy::getInstalled(const QModelIndex &i) const {
 }
 
 void LevelListProxy::setClassFilter(const QString &c) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     if (c == m_all) {
         m_class = 0;
     } else {
         m_class = StaticData::getClassID().at(c);
     }
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setTypeFilter(const QString &t) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     if (t == m_all) {
         m_type = 0;
     } else {
         m_type = StaticData::getTypeID().at(t);
     }
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setDifficultyFilter(const QString &d) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     if (d == m_all) {
         m_difficulty = 0;
     } else {
         m_difficulty = StaticData::getDifficultyID().at(d);
     }
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setDurationFilter(const QString &d) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     if(d == m_all) {
         m_duration = 0;
     } else {
         m_duration = StaticData::getDurationID().at(d);
     }
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setSearchFilter(const QString &s) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     m_search = s;
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setSearchType(const QString &t) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     if (t == "Level") {
         m_searchType = 0;
     } else if (t ==  "Author") {
         m_searchType = 1;
     }
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setInstalledFilter(bool on) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+#else
     beginFilterChange();
+#endif
     m_installed = on;
+#if QT_VERSION <= QT_VERSION_CHECK(6, 4, 2)
+    invalidateFilter();
+#else
     endFilterChange();
+#endif
 }
 
 void LevelListProxy::setSortMode(SortMode mode) {

src/TombRaiderLinuxLauncher.ui

@@ -1797,9 +1797,6 @@
                  <property name="selectionMode">
                   <enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
                  </property>
-                 <property name="supportedDragActions">
-                  <set>Qt::DropAction::IgnoreAction</set>
-                 </property>
                  <attribute name="horizontalHeaderVisible">
                   <bool>true</bool>
                  </attribute>