From bbd42e167d1888afed5be60b523a2e213abd17b9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 16 Mar 2024 23:14:44 +0100 Subject: [PATCH] Adapt default QQC2 style definitions for Qt 6 The casing is important, otherwise this results in the error `module "material" is not installed`. --- resources/qtconfigarguments.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/qtconfigarguments.h b/resources/qtconfigarguments.h index c2231c7..d60b2cb 100644 --- a/resources/qtconfigarguments.h +++ b/resources/qtconfigarguments.h @@ -9,6 +9,13 @@ #include #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#if defined(PLATFORM_ANDROID) +#define QT_UTILITIES_DEFAULT_QQC2_STYLE "Material" +#elif defined(PLATFORM_WINDOWS) +#define QT_UTILITIES_DEFAULT_QQC2_STYLE "Universal" +#endif +#else #if defined(PLATFORM_ANDROID) #define QT_UTILITIES_DEFAULT_QQC2_STYLE "material" #elif defined(PLATFORM_WINDOWS) @@ -16,6 +23,8 @@ #endif #endif +#endif + namespace CppUtilities { class QT_UTILITIES_EXPORT QtConfigArguments {