Merge pull request #5091 from opengisch/QF-3754-link-functions

Make all `onLinkActivated` proper functions with parameters
opengisch · Mar 16, 2024 · 26581ce · 26581ce
2 parents bb545b5 + b75cc5b
commit 26581ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/qml/Changelog.qml b/src/qml/Changelog.qml
@@ -85,7 +85,7 @@ Popup {
                             }
                         }
 
-                        onLinkActivated: Qt.openUrlExternally(link)
+                        onLinkActivated: (link) => { Qt.openUrlExternally(link) }
                     }
 
                     BusyIndicator {

diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -252,7 +252,7 @@ Page {
         opacity: textLabel.opacity
         color: Theme.mainTextColor
         linkColor: Theme.mainColor
-        onLinkActivated: Qt.openUrlExternally(link)
+        onLinkActivated: (link) => { Qt.openUrlExternally(link) }
       }
     }
   }

diff --git a/src/qml/QFieldCloudLogin.qml b/src/qml/QFieldCloudLogin.qml
@@ -195,7 +195,7 @@ Item {
         wrapMode: Text.WordWrap
         visible: cloudConnection.status === QFieldCloudConnection.Disconnected
 
-        onLinkActivated: {
+        onLinkActivated: (link) => {
           browserPopup.url = link
           browserPopup.fullscreen = true
           browserPopup.open()
@@ -213,7 +213,7 @@ Item {
         textFormat: Text.RichText
         wrapMode: Text.WordWrap
 
-        onLinkActivated: Qt.openUrlExternally(link)
+        onLinkActivated: (link) => { Qt.openUrlExternally(link) }
       }
 
       Item {

diff --git a/src/qml/QFieldCloudPopup.qml b/src/qml/QFieldCloudPopup.qml
@@ -54,7 +54,7 @@ Popup {
         wrapMode: Text.WordWrap
         horizontalAlignment: Text.AlignHCenter
 
-        onLinkActivated: Qt.openUrlExternally(link)
+        onLinkActivated: (link) => { Qt.openUrlExternally(link) }
       }
 
       Item {

diff --git a/src/qml/QFieldSettings.qml b/src/qml/QFieldSettings.qml
@@ -515,7 +515,7 @@ Page {
                           wrapMode: Text.WordWrap
                           Layout.fillWidth: true
 
-                          onLinkActivated: Qt.openUrlExternally(link)
+                          onLinkActivated: (link) => { Qt.openUrlExternally(link) }
                       }
 
                       Label {
@@ -568,7 +568,7 @@ Page {
                           wrapMode: Text.WordWrap
                           Layout.fillWidth: true
 
-                          onLinkActivated: Qt.openUrlExternally(link)
+                          onLinkActivated: (link) => { Qt.openUrlExternally(link) }
                       }
                   }
 

diff --git a/src/qml/editorwidgets/TextEdit.qml b/src/qml/editorwidgets/TextEdit.qml
@@ -37,7 +37,7 @@ EditorWidgetBase {
                                ? config['UseHtml'] === true ? value : stringUtilities.insertLinks(value)
                                : stringUtilities.insertLinks(value).replace('\n','')
 
-    onLinkActivated: Qt.openUrlExternally(link)
+    onLinkActivated: (link) => { Qt.openUrlExternally(link) }
   }
 
   TextField {
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,7 @@ Popup { @@
                                 }
                             }
-                            onLinkActivated: Qt.openUrlExternally(link)
+                            onLinkActivated: (link) => { Qt.openUrlExternally(link) }
                         }
                         BusyIndicator {
@@ Expand Down @@