sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61844 from benoitdm-oslandia/fix/qt6_test_core_qgis

Browse Source 
tests: adapt QVariant compare and QgsFlagKeysToValue tests to qt6
This commit is contained in:
Even Rouault 2025-05-22 10:49:18 +01:00 committed by GitHub
commit ce53380d1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgis.cpp
View File

@ -279,7 +279,7 @@ int qgsVariantCompare( const QVariant &lhs, const QVariant &rhs )
}
default:
return QString::localeAwareCompare( lhs.toString(), rhs.toString() );
return std::clamp( QString::localeAwareCompare( lhs.toString(), rhs.toString() ), -1, 1 );
}
}

6
src/core/qgis.h
View File

@ -6601,9 +6601,9 @@ template<class T> T qgsFlagKeysToValue( const QString &keys, const T &defaultVal
const int intValue = keys.toInt( &canConvert );
if ( canConvert )
{
const QByteArray keys = metaEnum.valueToKeys( intValue );
const int intValueCheck = metaEnum.keysToValue( keys );
if ( intValue == intValueCheck )
const QByteArray keyArray = metaEnum.valueToKeys( intValue );
const int intValueCheck = metaEnum.keysToValue( keyArray );
if ( !keyArray.isEmpty() && intValue == intValueCheck )
{
if ( returnOk )
{