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

8
desktop-widgets/mainwindow.cpp
View file

@ -132,7 +132,9 @@ MainWindow::MainWindow() : QMainWindow(),
// for the "default" mode
mainTab.reset(new MainTab);
diveList.reset(new DiveListView);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
mapWidget.reset(MapWidget::instance()); // Yes, this is ominous see comment in mapwidget.cpp.
#endif
plannerWidgets.reset(new PlannerWidgets);
statistics.reset(new StatsWidget);
profile.reset(new ProfileWidget);
@ -198,7 +200,9 @@ MainWindow::MainWindow() : QMainWindow(),
initialUiSetup();
readSettings();
diveList->setFocus();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
MapWidget::instance()->reload();
#endif
diveList->expand(diveList->model()->index(0, 0));
diveList->scrollTo(diveList->model()->index(0, 0), QAbstractItemView::PositionAtCenter);
#ifdef NO_USERMANUAL
@ -327,7 +331,9 @@ void MainWindow::selectionChanged()
if (current_dive)
enableDisableOtherDCsActions();
profile->plotCurrentDive();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
MapWidget::instance()->selectionChanged();
#endif
}
void MainWindow::on_actionNew_triggered()
@ -508,7 +514,9 @@ void MainWindow::closeCurrentFile()
clear_dive_file_data(); // this clears all the core data structures and resets the models
setCurrentFile(nullptr);
diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
MapWidget::instance()->reload();
#endif
if (!existing_filename)
setTitle();
disableShortcuts();