fix: resolve compilation failure on Qt 6.9

CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="5.7.14"></a>
+## 5.7.14 (2025-04-12)
+
+### Bug Fixes
+
+* resolve compilation failure on Qt 6.9
+
 <a name="2.0.14"></a>
 ## 2.0.14 (2019-05-23)
 

debian/changelog

@@ -1,3 +1,9 @@
+dtkcore (5.7.14) unstable; urgency=medium
+
+  * fix: resolve compilation failure on Qt 6.9
+
+ -- JiDe Zhang <zhangjide@deepin.org>  Sat, 12 Apr 2025 17:19:00 +0800
+
 dtkcore (5.7.13) unstable; urgency=medium
 
   * fix: add copyright for dconfig_org_deepin_dtk_preference.hpp

include/util/dvtablehook.h

@@ -222,7 +222,11 @@ class LIBDTKCORESHARED_EXPORT DVtableHook
         Q_STATIC_ASSERT_X((FunctorArgumentCount >= 0),
                           "Function1 and Function2 arguments are not compatible.");
         const int Fun2ArgumentCount = (FunctorArgumentCount >= 0) ? FunctorArgumentCount : 0;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+        typedef typename QtPrivate::FunctorReturnType<Fun2, typename QtPrivate::List_Left<typename FunctionPointer<Fun1>::Arguments, Fun2ArgumentCount>::Value>::type Fun2ReturnType;
+#else
         typedef typename QtPrivate::FunctorReturnType<Fun2, typename QtPrivate::List_Left<typename FunctionPointer<Fun1>::Arguments, Fun2ArgumentCount>::Value>::Value Fun2ReturnType;
+#endif
 
         Q_STATIC_ASSERT_X((QtPrivate::AreArgumentsCompatible<Fun2ReturnType, typename FunInfo1::ReturnType>::value),
                           "Function1 and Function2 return type are not compatible.");

tools/dconfig2cpp/main.cpp

@@ -15,7 +15,7 @@
 static QString toUnicodeEscape(const QString& input) {
     QString result;
     for (QChar ch : input) {
-        result += QString("\\u%1").arg(ch.unicode(), 4, 16, QChar('0'));
+        result += QString("\\u%1").arg(static_cast<short>(ch.unicode()), 4, 16, QChar('0'));
     }
     return result;
 }