chore: Adapt to compile for qt6

Adapt to compile. Issue: linuxdeepin/dtk#86
linuxdeepin · May 29, 2023 · 55241f9 · 55241f9
1 parent 1897624
commit 55241f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dconfig-center/dde-dconfig-daemon/dconfigresource.cpp b/dconfig-center/dde-dconfig-daemon/dconfigresource.cpp
@@ -386,8 +386,8 @@ void DSGConfigResource::doGlobalValueChanged(const QString &key, const ResourceK
 */
 void DSGConfigResource::repareCache(DConfigCache *cache, DConfigMeta *oldMeta, DConfigMeta *newMeta)
 {
-    const auto &newKeyList = newMeta->keyList().toSet();
-    const auto &oldKeyList = oldMeta->keyList().toSet();
+    const QSet<QString> &newKeyList = {newMeta->keyList().begin(), newMeta->keyList().end()};
+    const QSet<QString> &oldKeyList = {oldMeta->keyList().begin(), oldMeta->keyList().end()};
 
     // 配置项已经被移除，oldMeta - newMeta，移除cache值
     const auto subtractKeys = oldKeyList - (newKeyList);

diff --git a/dconfig-center/dde-dconfig-daemon/main.cpp b/dconfig-center/dde-dconfig-daemon/main.cpp
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
     QCommandLineOption localPrefixOption("p", QCoreApplication::translate("main", "working prefix directory."), "prefix", QString());
     parser.addOption(localPrefixOption);
 
-    QCommandLineOption exitOption("e", QCoreApplication::translate("main", "exit application when all resource released."), "exit", QString(true));
+    QCommandLineOption exitOption("e", QCoreApplication::translate("main", "exit application when all resource released."), "exit", QString::number(true));
     parser.addOption(exitOption);
 
     parser.process(a);