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

Fix compiling with legacy Qt (aka Qt5)

Browse Source
This commit is contained in:
Matthias Kuhn 2021-03-25 12:22:35 +01:00
parent 42b79396b4
commit 20596227f7
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/core/auto_generated/qgis.sip.in
View File

@ -259,6 +259,7 @@ QVariant data types (such as strings, numeric values, dates and times)
.. seealso:: :py:func:`qgsVariantLessThan` .. seealso:: :py:func:`qgsVariantLessThan`
%End %End
bool operator> ( const QVariant &v1, const QVariant &v2 ); bool operator> ( const QVariant &v1, const QVariant &v2 );
bool operator< ( const QVariant &v1, const QVariant &v2 ); bool operator< ( const QVariant &v1, const QVariant &v2 );

3
src/core/qgis.h
View File

@ -552,6 +552,8 @@ CORE_EXPORT bool qgsVariantEqual( const QVariant &lhs, const QVariant &rhs );
*/ */
CORE_EXPORT bool qgsVariantGreaterThan( const QVariant &lhs, const QVariant &rhs ); CORE_EXPORT bool qgsVariantGreaterThan( const QVariant &lhs, const QVariant &rhs );
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/** /**
* Compares two QVariant values and returns whether the first is greater than the second. * Compares two QVariant values and returns whether the first is greater than the second.
* Useful for sorting lists of variants, correctly handling sorting of the various * Useful for sorting lists of variants, correctly handling sorting of the various
@ -576,6 +578,7 @@ inline bool operator< ( const QVariant &v1, const QVariant &v2 )
{ {
return qgsVariantLessThan( v1, v2 ); return qgsVariantLessThan( v1, v2 );
} }
#endif
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)