sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#399
linuxdeepin · Sep 23, 2024 · 9323012 · 9323012
1 parent 02e67a4
commit 9323012
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/qt6/src/qml/ToolTip.qml b/qt6/src/qml/ToolTip.qml
@@ -27,7 +27,7 @@ T.ToolTip {
         verticalAlignment: Text.AlignVCenter
         text: control.text
         font: control.font
-        wrapMode: Text.WordWrap
+        wrapMode: Text.Wrap
         opacity: enabled ? 1.0 : 0.4
         color: control.palette.toolTipText
     }

diff --git a/src/private/dquickbackdropblitter.cpp b/src/private/dquickbackdropblitter.cpp
@@ -276,10 +276,6 @@ QSGNode *DQuickBackdropBlitter::updatePaintNode(QSGNode *oldNode, QQuickItem::Up
 
     node->setContentItem(d->container);
     node->setTextureChangedCallback(onTextureChanged, d);
-    connect(this, &QObject::destroyed, this, [node](){
-        // fix callback crashed...
-        node->setTextureChangedCallback(nullptr, nullptr);
-    });
     node->resize(size());
     onTextureChanged(node, d);
 

diff --git a/src/qml/ToolTip.qml b/src/qml/ToolTip.qml
@@ -27,7 +27,7 @@ T.ToolTip {
         verticalAlignment: Text.AlignVCenter
         text: control.text
         font: control.font
-        wrapMode: Text.WordWrap
+        wrapMode: Text.Wrap
         opacity: enabled ? 1.0 : 0.4
         color: control.palette.toolTipText
     }