sync: from linuxdeepin/qt5integration

deepin-ci-robot · 18202781743 · commit bb3c46291596 · 2025-07-28T15:48:07.000+08:00
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#276
diff --git a/iconengineplugins/svgiconengine/qsvgiconengine.cpp b/iconengineplugins/svgiconengine/qsvgiconengine.cpp
@@ -232,7 +232,7 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
         const QImage image = renderer.toImage(actualSize);
 
         if (Q_LIKELY(!image.isNull() && !cacheFile.isEmpty())) {
-            [[ maybe_unused ]] auto result = QtConcurrent::run(QThreadPool::globalInstance(), [image, cacheFile, svgFile] {
+            auto result = QtConcurrent::run(QThreadPool::globalInstance(), [image, cacheFile, svgFile] {
                 QSaveFile file(cacheFile);
                 // 增加cache文件能被成功保存的概率
                 file.setDirectWriteFallback(true);
@@ -254,6 +254,7 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
                                         << ", cache file:" << cacheFile << ", svg file:" << svgFile;
                 }
             });
+            Q_UNUSED(result)
         }
 
         // 缩放图标到目标大小

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,`
`232`	`232`	`const QImage image = renderer.toImage(actualSize);`
`233`	`233`
`234`	`234`	`if (Q_LIKELY(!image.isNull() && !cacheFile.isEmpty())) {`
`235`		`- [[ maybe_unused ]] auto result = QtConcurrent::run(QThreadPool::globalInstance(), [image, cacheFile, svgFile] {`
	`235`	`+ auto result = QtConcurrent::run(QThreadPool::globalInstance(), [image, cacheFile, svgFile] {`
`236`	`236`	`QSaveFile file(cacheFile);`
`237`	`237`	`// 增加cache文件能被成功保存的概率`
`238`	`238`	`file.setDirectWriteFallback(true);`
`@@ -254,6 +254,7 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,`
`254`	`254`	`<< ", cache file:" << cacheFile << ", svg file:" << svgFile;`
`255`	`255`	`}`
`256`	`256`	`});`
	`257`	`+ Q_UNUSED(result)`
`257`	`258`	`}`
`258`	`259`
`259`	`260`	`// 缩放图标到目标大小`