[QgsQuick] Fix overlaped variable name with QT widget's variable

Qt 5.14 introduced currentValue variable for combobox widget which clashes with qgsquick variable
qgis · Apr 28, 2020 · 35576d7 · 35576d7
1 parent e89b728
commit 35576d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/quickgui/plugin/editor/qgsquickvaluemap.qml b/src/quickgui/plugin/editor/qgsquickvaluemap.qml
@@ -38,7 +38,7 @@ Item {
   QgsQuick.EditorWidgetComboBox {
     // Reversed to model's key-value map. It is used to find index according current value
     property var reverseConfig: ({})
-    property var currentValue: value
+    property var currentEditorValue: value
 
     comboStyle: customStyle.fields
     textRole: 'display'
@@ -81,7 +81,7 @@ Item {
     }
 
     // Workaround to get a signal when the value has changed
-    onCurrentValueChanged: {
+    onCurrentEditorValueChanged: {
       currentIndex = find(reverseConfig[value])
     }
 

diff --git a/src/quickgui/plugin/editor/qgsquickvaluerelation.qml b/src/quickgui/plugin/editor/qgsquickvaluerelation.qml
@@ -37,7 +37,7 @@ Item {
 
   QgsQuick.EditorWidgetComboBox {
 
-    property var currentValue: value
+    property var currentEditorValue: value
 
     comboStyle: customStyle.fields
     textRole: 'display'
@@ -58,7 +58,7 @@ Item {
     }
 
     // Called when the same form is used for a different feature
-    onCurrentValueChanged: {
+    onCurrentEditorValueChanged: {
         currentIndex = vrModel.rowForKey(value);
     }