fix type error in value relation

qgis · Nov 2, 2020 · d6247fd · d6247fd
1 parent ed709c1
commit d6247fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/quickgui/qgsquickfeatureslistmodel.cpp b/src/quickgui/qgsquickfeatureslistmodel.cpp
@@ -253,18 +253,18 @@ int QgsQuickFeaturesListModel::rowFromAttribute( const int role, const QVariant
   return -1;
 }
 
-int QgsQuickFeaturesListModel::keyFromAttribute( const int role, const QVariant &value ) const
+QVariant QgsQuickFeaturesListModel::keyFromAttribute( const int role, const QVariant &value ) const
 {
   for ( int i = 0; i < mFeatures.count(); ++i )
   {
     QVariant d = data( index( i, 0 ), role );
     if ( d == value )
     {
       QVariant key = data( index( i, 0 ), KeyColumn );
-      return key.toInt();
+      return key;
     }
   }
-  return -1;
+  return QVariant();
 }
 
 QgsQuickFeatureLayerPair QgsQuickFeaturesListModel::featureLayerPair( const int &featureId )

diff --git a/src/quickgui/qgsquickfeatureslistmodel.h b/src/quickgui/qgsquickfeatureslistmodel.h
@@ -112,7 +112,7 @@ class QUICK_EXPORT QgsQuickFeaturesListModel : public QAbstractListModel
      * \return KeyColumn role for found feature, returns -1 if no feature is found. If more features
      * match requested role and value, KeyColumn for first is returned.
      */
-    Q_INVOKABLE int keyFromAttribute( const int role, const QVariant &value ) const;
+    Q_INVOKABLE QVariant keyFromAttribute( const int role, const QVariant &value ) const;
 
     //! Returns maximum amount of features that can be queried from layer
     int featuresLimit() const;