Merge pull request #58719 from elpaso/bugfix-authstorage-api-qt6

Auth storage API fix debug code with QT6
qgis · Sep 16, 2024 · 6c52cb2 · 6c52cb2
2 parents fce8f62 + a0ec39a
commit 6c52cb2
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/core/auth/qgsauthconfigurationstoragedb.cpp b/src/core/auth/qgsauthconfigurationstoragedb.cpp
@@ -169,17 +169,25 @@ bool QgsAuthConfigurationStorageDb::authDbQuery( QSqlQuery *query, const QString
 
   auto boundQuery = []( const QSqlQuery * query ) -> QString
   {
-#ifdef QGISDEBUG
     QString str = query->lastQuery();
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
     QMapIterator<QString, QVariant> it( query->boundValues() );
+#else
+    const QStringList keys = query->boundValueNames();
+    const QVariantList values = query->boundValues();
+    QMap<QString, QVariant> boundValues;
+   for ( int i=0; i<keys.count(); i++)
+    {
+      boundValues.insert( keys.at( i ), values.at( i ).toString() );
+    }
+    QMapIterator<QString, QVariant> it = QMapIterator<QString, QVariant>( boundValues );
+#endif
     while ( it.hasNext() )
     {
       it.next();
       str.replace( it.key(), it.value().toString() );
     }
     return str;
-#endif
-    return query->executedQuery();
   };
 
   if ( !result )