VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-01-05 07:48:40 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2566 from srcejon/fix_qt_6_10

Browse Source 
Fix build with Qt 6.10.1.
This commit is contained in:
Edouard Griffiths 2025-11-26 21:10:21 +01:00 committed by GitHub
commit 96b096082e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -657,7 +657,8 @@ if(ENABLE_QT6)
MultimediaWidgets
Positioning
Charts
SerialPort)
SerialPort
CorePrivate)
else()
find_package(Qt5 5.15
REQUIRED COMPONENTS

5
plugins/feature/map/mapmodel.cpp
View File

@ -575,8 +575,10 @@ bool ObjectMapModel::isTarget(const ObjectMapItem *mapItem) const
// FIXME: This should use Z order - rather than adding/removing
// but I couldn't quite get it to work
// Causes a crash with Qt 6.10+
Q_INVOKABLE void ObjectMapModel::moveToFront(int oldRow)
{
#if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0))
// Last item in list is drawn on top, so remove than add to end of list
if (oldRow < m_items.size() - 1)
{
@ -593,10 +595,12 @@ Q_INVOKABLE void ObjectMapModel::moveToFront(int oldRow)
QModelIndex idx = index(newRow);
emit dataChanged(idx, idx);
}
#endif
}
Q_INVOKABLE void ObjectMapModel::moveToBack(int oldRow)
{
#if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0))
// First item in list is drawn first, so remove item then add to front of list
if ((oldRow < m_items.size()) && (oldRow > 0))
{
@ -617,6 +621,7 @@ Q_INVOKABLE void ObjectMapModel::moveToBack(int oldRow)
endResetModel();
//emit dataChanged(index(oldRow), index(newRow));
}
#endif
}
Q_INVOKABLE void ObjectMapModel::link(const QString& url)