mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Qt6: don't build MapWidget

Browse source 
Since Qt6 doesn't include QtLocation anymore, we can't build MapWidget.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-02-09 15:56:36 -08:00
parent ce254bee57
commit 47d900bee5
5 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/divefilter.cpp
View file

@ -148,7 +148,9 @@ void DiveFilter::startFilterDiveSites(QVector<dive_site *> ds)
dive_sites = ds;
// When switching into dive site mode, reload the dive sites.
// TODO: why here? why not catch the filterReset signal in the map widget
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
MapWidget::instance()->reload();
#endif
emit diveListNotifier.filterReset();
}
}
@ -159,7 +161,9 @@ void DiveFilter::stopFilterDiveSites()
return;
dive_sites.clear();
emit diveListNotifier.filterReset();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
MapWidget::instance()->reload();
#endif
}
void DiveFilter::setFilterDiveSite(QVector<dive_site *> ds)
@ -172,8 +176,10 @@ void DiveFilter::setFilterDiveSite(QVector<dive_site *> ds)
dive_sites = ds;
emit diveListNotifier.filterReset();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
MapWidget::instance()->setSelected(dive_sites);
MapWidget::instance()->selectionChanged();
#endif
MainWindow::instance()->diveList->expandAll();
}