sync: from linuxdeepin/dtkcore

Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#510

Author: deepin-ci-robot

src/CMakeLists.txt

@@ -12,10 +12,16 @@ find_package(DBus1 REQUIRED)
 if(LINUX)
   find_package(PkgConfig REQUIRED)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus)
-  if("${QT_VERSION_MAJOR}" STREQUAL "5")
+
+  if(${QT_VERSION_MAJOR} EQUAL 5)
       pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt) #Dtk6 removed.
+  elseif(${QT_VERSION_MAJOR} EQUAL 6)
+      if(${Qt6Core_VERSION} VERSION_GREATER_EQUAL 6.10.0)
+          find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS CorePrivate)
+      endif()
+  else()
+      message(FATAL_ERROR "Unsupported Qt version: ${QT_VERSION_MAJOR}")
   endif()
-
 endif()
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Xml)
 find_package(DtkBuildHelper REQUIRED)

src/dci/private/ddcifileengine.cpp

@@ -621,10 +621,20 @@ bool DDciFileEngine::supportsExtension(QAbstractFileEngine::Extension extension)
     return extension == AtEndExtension;
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+DDciFileEngine::TriStateResult DDciFileEngine::cloneTo(QAbstractFileEngine *target)
+#else
 bool DDciFileEngine::cloneTo(QAbstractFileEngine *target)
+#endif
 {
     const QByteArray &data = file->dataRef(subfilePath);
-    return target->write(data.constData(), data.size()) == data.size();
+    auto ret = target->write(data.constData(), data.size()) == data.size();
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    return ret ? DDciFileEngine::TriStateResult::Success : DDciFileEngine::TriStateResult::Failed;
+#else
+    return ret;
+#endif
 }
 
 bool DDciFileEngine::forceSave(bool writeFile) const

src/dci/private/ddcifileengine_p.h

@@ -129,7 +129,11 @@ class DDciFileEngine : public QAbstractFileEngine
                    ExtensionReturn *output = 0) override;
     bool supportsExtension(Extension extension) const override;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    TriStateResult cloneTo(QAbstractFileEngine *target) override;
+#else
     bool cloneTo(QAbstractFileEngine *target) override;
+#endif
 
 private:
     bool forceSave(bool writeFile = false) const;

src/filesystem/dcapfsfileengine.cpp

@@ -195,12 +195,21 @@ QAbstractFileEngine::FileFlags DCapFSFileEngine::fileFlags(QAbstractFileEngine::
     return ret;
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+DCapFSFileEngine::TriStateResult DCapFSFileEngine::cloneTo(QAbstractFileEngine *target)
+#else
 bool DCapFSFileEngine::cloneTo(QAbstractFileEngine *target)
+#endif
 {
     D_DC(DCapFSFileEngine);
     const QString targetPath = target->fileName(DCapFSFileEngine::AbsolutePathName);
-    if (!d->canReadWrite(targetPath))
+    if (!d->canReadWrite(targetPath)) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+        return DCapFSFileEngine::TriStateResult::Failed;
+#else
         return false;
+#endif
+    }
     return QFSFileEngine::cloneTo(target);
 }
 

src/filesystem/private/dcapfsfileengine_p.h

@@ -48,7 +48,13 @@ class DCapFSFileEngine : public QFSFileEngine, public DObject
 #endif
     bool rmdir(const QString &dirName, bool recurseParentDirectories) const override;
     FileFlags fileFlags(FileFlags type) const override;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    TriStateResult cloneTo(QAbstractFileEngine *target) override;
+#else
     bool cloneTo(QAbstractFileEngine *target) override;
+#endif
+
     bool setSize(qint64 size) override;
     QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 1)

tests/CMakeLists.txt

@@ -20,6 +20,12 @@ if(LINUX)
     find_package(PkgConfig REQUIRED)
     if("${QT_VERSION_MAJOR}" STREQUAL "5")
         pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
+    elseif(${QT_VERSION_MAJOR} EQUAL 6)
+        if(${Qt6Core_VERSION} VERSION_GREATER_EQUAL 6.10.0)
+            find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS CorePrivate)
+        endif()
+    else()
+        message(FATAL_ERROR "Unsupported Qt version: ${QT_VERSION_MAJOR}")
     endif()
 endif()
 

tools/dci/CMakeLists.txt

@@ -3,6 +3,13 @@ set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR})
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
+
+if(${QT_VERSION_MAJOR} EQUAL 6)
+    if(${Qt6Core_VERSION} VERSION_GREATER_EQUAL 6.10.0)
+      find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS CorePrivate)
+    endif()
+endif()
+
 add_definitions(-DDTK_NO_PROJECT)
 # start dci
 include(../../src/dci/dci.cmake)

tools/deepin-os-release/CMakeLists.txt

@@ -4,6 +4,12 @@ set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR})
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_AUTOMOC ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
+if(${QT_VERSION_MAJOR} EQUAL 6)
+    if(${Qt6Core_VERSION} VERSION_GREATER_EQUAL 6.10.0)
+      find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS CorePrivate)
+    endif()
+endif()
+
 add_definitions(-DDTK_NO_PROJECT)
 # start dci
 set(dci_SRCS

tools/qdbusxml2cpp/CMakeLists.txt

@@ -5,6 +5,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus)
 
+if(${QT_VERSION_MAJOR} EQUAL 6)
+    if (${Qt6DBus_VERSION} VERSION_GREATER_EQUAL 6.10.0)
+      find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBusPrivate)
+    endif()
+endif()
+
 add_executable(${BIN_NAME}
   qdbusxml2cpp.cpp
 )