sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#426
linuxdeepin · Dec 3, 2024 · 17eaba0 · 17eaba0
1 parent 45baf68
commit 17eaba0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/chameleon/CMakeLists.txt b/chameleon/CMakeLists.txt
@@ -101,7 +101,7 @@ endif()
 if(EnableQt6)
     qt_add_qml_module(${PLUGIN_NAME}
         URI "Chameleon"
-        VERSION "${PROJECT_VERSION}"
+        VERSION "1.0"
         CLASS_NAME QtQuickControls2ChameleonStylePlugin
         PLUGIN_TARGET ${PLUGIN_NAME}
         OUTPUT_DIRECTORY

diff --git a/src/private/dquickdciiconimage.cpp b/src/private/dquickdciiconimage.cpp
@@ -178,6 +178,9 @@ DQuickDciIconImagePrivate::DQuickDciIconImagePrivate(DQuickDciIconImage *qq)
     QObject::connect(imageItem, &DQuickIconImage::nameChanged, qq, &DQuickDciIconImage::nameChanged);
     QObject::connect(imageItem, &DQuickIconImage::asynchronousChanged, qq, &DQuickDciIconImage::asynchronousChanged);
     QObject::connect(imageItem, &DQuickIconImage::cacheChanged, qq, &DQuickDciIconImage::cacheChanged);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    QObject::connect(imageItem, &DQuickIconImage::retainWhileLoadingChanged, qq, &DQuickDciIconImage::retainWhileLoadingChanged);
+#endif
 }
 
 void DQuickDciIconImagePrivate::layout()
@@ -333,6 +336,20 @@ void DQuickDciIconImage::setAsynchronous(bool async)
     d->imageItem->setAsynchronous(async);
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+bool DQuickDciIconImage::retainWhileLoading() const
+{
+    D_DC(DQuickDciIconImage);
+    return d->imageItem->retainWhileLoading();
+}
+
+void DQuickDciIconImage::setRetainWhileLoading(bool retain)
+{
+    D_D(DQuickDciIconImage);
+    d->imageItem->setRetainWhileLoading(retain);
+}
+#endif
+
 bool DQuickDciIconImage::cache() const
 {
     D_DC(DQuickDciIconImage);

diff --git a/src/private/dquickdciiconimage_p.h b/src/private/dquickdciiconimage_p.h
@@ -32,6 +32,9 @@ class DQuickDciIconImage : public QQuickItem, DCORE_NAMESPACE::DObject
     Q_PROPERTY(bool fallbackToQIcon READ fallbackToQIcon WRITE setFallbackToQIcon NOTIFY fallbackToQIconChanged)
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
     Q_PROPERTY(bool cache READ cache WRITE setCache NOTIFY cacheChanged FINAL)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    Q_PROPERTY(bool retainWhileLoading READ retainWhileLoading WRITE setRetainWhileLoading NOTIFY retainWhileLoadingChanged)
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QML_NAMED_ELEMENT(DciIcon)
     QML_ATTACHED(DQuickIconAttached)
@@ -69,6 +72,11 @@ class DQuickDciIconImage : public QQuickItem, DCORE_NAMESPACE::DObject
     bool cache() const;
     void setCache(bool cache);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    bool retainWhileLoading() const;
+    void setRetainWhileLoading(bool retain);
+#endif
+
     DQuickIconImage *imageItem() const;
 
     static bool isNull(const QString &iconName);
@@ -85,6 +93,10 @@ class DQuickDciIconImage : public QQuickItem, DCORE_NAMESPACE::DObject
     void asynchronousChanged();
     void cacheChanged();
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    void retainWhileLoadingChanged();
+#endif
+
 protected:
     void classBegin() override;
     void componentComplete() override;