From fc835ae7c8ca8777e48c7631c11d7e8887fba2c3 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert@griebl.org>
Date: Tue, 1 Jul 2025 22:48:07 +0200
Subject: [PATCH] Add support for Qt 6.9 and 6.10

---
 CMakeLists.txt                    | 13 ++++++++++++-
 src/bricklink/order.cpp           |  2 +-
 src/bricklink/picture.cpp         |  1 +
 src/common/brickstore_wrapper.cpp |  4 ++++
 src/scanner/capture.cpp           |  1 +
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8039a31..317dc796 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
 set(SENTRY_VERSION 0.7.10)
-set(QCORO_VERSION  0.10.0)
+set(QCORO_VERSION  0.12.0)
 
 # for QtCreator
 set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/imports CACHE STRING "" FORCE)
@@ -170,17 +170,28 @@ if (ANDROID OR IOS OR FORCE_MOBILE)
     set(QUICK_CONTROLS "QtQuick.Controls.Material")
     find_package(Qt6 CONFIG QUIET REQUIRED Qml Quick Quick3D QuickControls2Impl QuickDialogs2 QuickTemplates2 QuickDialogs2Utils Svg Multimedia MultimediaQuickPrivate)
 
+    if (${Qt6_VERSION} VERSION_GREATER_EQUAL "6.10.0")
+        find_package(Qt6 CONFIG QUIET REQUIRED QmlPrivate QuickPrivate QuickTemplates2Private QuickDialogs2Private QuickControls2ImplPrivate QuickDialogs2UtilsPrivate)
+    endif()
+
 elseif (BACKEND_ONLY)
     set(BS_BACKEND ON)
     set(BS_TYPE "Backend")
     add_compile_definitions(BS_BACKEND)
 
+    if (${Qt6_VERSION} VERSION_GREATER_EQUAL "6.10.0")
+        find_package(Qt6 CONFIG QUIET REQUIRED GuiPrivate)
+    endif()
+
 else()
     set(BS_DESKTOP ON)
     set(BS_TYPE "Desktop")
     add_compile_definitions(BS_DESKTOP)
     find_package(Qt6 CONFIG QUIET REQUIRED Widgets PrintSupport Qml Quick Quick3D Multimedia QuickWidgets Svg)
 
+    if (${Qt6_VERSION} VERSION_GREATER_EQUAL "6.10.0")
+        find_package(Qt6 CONFIG QUIET REQUIRED GuiPrivate WidgetsPrivate QmlPrivate QuickPrivate)
+    endif()
 endif()
 
 if (${Qt6_VERSION} VERSION_LESS "${MIN_QT_VERSION}")
diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp
index 59856f0c..f5dec464 100755
--- a/src/bricklink/order.cpp
+++ b/src/bricklink/order.cpp
@@ -1090,7 +1090,7 @@ void Orders::importOldCache(const QString &userId)
     d->m_db.commit();
 
     QFile importedFile(imported.absoluteFilePath());
-    importedFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
+    (void) importedFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
     importedFile.close();
 }
 
diff --git a/src/bricklink/picture.cpp b/src/bricklink/picture.cpp
index df0ff459..e1906b80 100755
--- a/src/bricklink/picture.cpp
+++ b/src/bricklink/picture.cpp
@@ -8,6 +8,7 @@
 #include <QtCore/QBuffer>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QElapsedTimer>
 #include <QtNetwork/QNetworkInformation>
 #include <QtSql/QSqlError>
 #include <QtSql/QSqlQuery>
diff --git a/src/common/brickstore_wrapper.cpp b/src/common/brickstore_wrapper.cpp
index b4f10f67..e6f666a2 100755
--- a/src/common/brickstore_wrapper.cpp
+++ b/src/common/brickstore_wrapper.cpp
@@ -1109,7 +1109,11 @@ void QmlDebug::setSlowAnimations(bool newSlowAnimations)
 {
     if (m_slowAnimations != newSlowAnimations) {
         m_slowAnimations = newSlowAnimations;
+#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
         QUnifiedTimer::instance()->setSlowModeEnabled(m_slowAnimations);
+#else
+        QUnifiedTimer::instance()->setSpeedModifier(m_slowAnimations ? .2f : 1.f);
+#endif
         emit slowAnimationsChanged(m_slowAnimations);
     }
 }
diff --git a/src/scanner/capture.cpp b/src/scanner/capture.cpp
index 3a191fa5..c86287b1 100644
--- a/src/scanner/capture.cpp
+++ b/src/scanner/capture.cpp
@@ -9,6 +9,7 @@
 #include <QTimer>
 #include <QGuiApplication>
 #include <QPointer>
+#include <QElapsedTimer>
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(permissions)
 #  include <QCoreApplication>
 #  include <QPermissions>