sync: from linuxdeepin/dtkcore

Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#495

Author: deepin-ci-robot

.packit.yaml

@@ -4,7 +4,7 @@
 specfile_path: rpm/dtkcore.spec
 
 # add or remove files that should be synced
-files_to_sync:
+synced_files:
     - rpm/dtkcore.spec
     - .packit.yaml
 

src/CMakeLists.txt

@@ -25,6 +25,12 @@ find_package(ICU REQUIRED COMPONENTS uc)
 pkg_check_modules(uchardet REQUIRED uchardet)
 # end text encoding
 
+# 为不包含实际QObject类的头文件跳过AutoMOC处理
+set_property(SOURCE ../include/base/dsingleton.h PROPERTY SKIP_AUTOMOC ON)
+if("${DTK_VERSION_MAJOR}" STREQUAL "6")
+    set_property(SOURCE ../include/util/dthreadutils.h PROPERTY SKIP_AUTOMOC ON)
+endif()
+
 # start base
 include(base/base.cmake)
 # end base

src/dconfig.cpp

@@ -18,6 +18,7 @@
 #include <QLoggingCategory>
 #include <QCoreApplication>
 #include <unistd.h>
+#include <memory>
 
 // https://gitlabwh.uniontech.com/wuhan/se/deepin-specifications/-/issues/3
 
@@ -173,13 +174,13 @@ class Q_DECL_HIDDEN FileBackend : public DConfigBackend
         if (owner->appId == NoAppId)
             return true;
 
-        QScopedPointer<DConfigFile> file(new DConfigFile(NoAppId, owner->name, owner->subpath));
+        std::unique_ptr<DConfigFile> file(new DConfigFile(NoAppId, owner->name, owner->subpath));
         const bool canFallbackToGeneric = !file->meta()->metaPath(prefix).isEmpty();
         if (canFallbackToGeneric) {
-            QScopedPointer<DConfigCache> cache(file->createUserCache(getuid()));
+            std::unique_ptr<DConfigCache> cache(file->createUserCache(getuid()));
             if (file->load(prefix) && cache->load(prefix)) {
-                genericConfigFile.reset(file.take());
-                genericConfigCache.reset(cache.take());
+                genericConfigFile.reset(file.release());
+                genericConfigCache.reset(cache.release());
             }
         }
         return true;
@@ -370,7 +371,7 @@ class Q_DECL_HIDDEN DBusBackend : public DConfigBackend
                 complexType >> list;
                 QVariantList res;
                 res.reserve(list.size());
-                for (const auto &item : qAsConst(list)) {
+                for (const auto &item : std::as_const(list)) {
                     res << decodeQDBusArgument(item);
                 }
                 return res;

src/util/drecentmanager.cpp

@@ -13,6 +13,7 @@
 #include <QUrl>
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #include <QStringConverter>
+#include <QTimeZone>
 #endif
 
 DCORE_BEGIN_NAMESPACE
@@ -67,7 +68,11 @@ bool DRecentManager::addItem(const QString &uri, DRecentData &data)
     QFile file(RECENT_PATH);
     file.open(QIODevice::ReadWrite | QIODevice::Text);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    QString dateTime = QDateTime::currentDateTime().toTimeZone(QTimeZone::UTC).toString(Qt::ISODate);
+#else
     QString dateTime = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+#endif
     QDomDocument doc;
 
     if (!doc.setContent(&file)) {