Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed: build against QT 6.8 #11951

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ApplicationLibCode/Application/Tools/RiaTextStringTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ bool RiaTextStringTools::isNumber( const QString& text, const QString& decimalPo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#if QT_VERSION < QT_VERSION_CHECK( 6, 8, 0 )
std::strong_ordering operator<=>( const QString& lhs, const QString& rhs )
{
return lhs.compare( rhs ) <=> 0;
}
#endif
3 changes: 3 additions & 0 deletions ApplicationLibCode/Application/Tools/RiaTextStringTools.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <QRegularExpression>
#include <QString>
#include <QStringList>
#include <QtGlobal>

#include <map>

Expand All @@ -47,6 +48,7 @@ bool isNumber( const QString& text, const QString& decimalPoint );

} // namespace RiaTextStringTools

#if QT_VERSION < QT_VERSION_CHECK( 6, 8, 0 )
//--------------------------------------------------------------------------------------------------
//
// Add operator<=> for QString to global scope
Expand All @@ -60,3 +62,4 @@ bool isNumber( const QString& text, const QString& decimalPoint );
//
//--------------------------------------------------------------------------------------------------
std::strong_ordering operator<=>( const QString& lhs, const QString& rhs );
#endif
Loading