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

build-system: make map support its own thing

Browse source 
Making this simply depend on Qt5 or Qt6 was short-sighted as work on QtLocation
upstream continues. Instead break this out as its own option.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-04-08 14:24:15 -10:00
parent 890f21bd58
commit 2241a28499
8 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/CMakeLists.txt
View file

@ -143,7 +143,7 @@ set(SUBSURFACE_INTERFACE
updatemanager.cpp
updatemanager.h
)
if(NOT USINGQT6)
if(MAPSUPPORT)
LIST(APPEND SUBSURFACE_INTERFACE
mapwidget.cpp
mapwidget.h

2
desktop-widgets/divelistview.cpp
View file

@ -523,7 +523,7 @@ void DiveListView::selectionChangeDone()
if (d->selected && !d->hidden_by_filter && d->dive_site && !selectedSites.contains(d->dive_site))
selectedSites.push_back(d->dive_site);
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#ifdef MAP_SUPPORT
MapWidget::instance()->setSelected(selectedSites);
#endif
}

8
desktop-widgets/mainwindow.cpp
View file

@ -134,7 +134,7 @@ MainWindow::MainWindow() :
// for the "default" mode
mainTab.reset(new MainTab);
diveList.reset(new DiveListView);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#ifdef MAP_SUPPORT
mapWidget.reset(MapWidget::instance()); // Yes, this is ominous see comment in mapwidget.cpp.
#endif
plannerWidgets.reset(new PlannerWidgets);
@ -200,7 +200,7 @@ MainWindow::MainWindow() :
initialUiSetup();
readSettings();
diveList->setFocus();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#ifdef MAP_SUPPORT
MapWidget::instance()->reload();
#endif
diveList->expand(diveList->model()->index(0, 0));
@ -329,7 +329,7 @@ void MainWindow::selectionChanged()
if (current_dive)
enableDisableOtherDCsActions();
profile->plotCurrentDive();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#ifdef MAP_SUPPORT
MapWidget::instance()->selectionChanged();
#endif
}
@ -507,7 +507,7 @@ 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)
#ifdef MAP_SUPPORT
MapWidget::instance()->reload();
#endif
if (!existing_filename)

2
desktop-widgets/tab-widgets/TabDiveNotes.cpp
View file

@ -34,7 +34,7 @@ TabDiveNotes::TabDiveNotes(QWidget *parent) : TabBase(parent),
connect(&diveListNotifier, &DiveListNotifier::commandExecuted, this, &TabDiveNotes::closeWarning);
connect(ui.editDiveSiteButton, &QToolButton::clicked, MainWindow::instance(), &MainWindow::startDiveSiteEdit);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#ifdef MAP_SUPPORT
connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex);
connect(ui.location, &DiveLocationLineEdit::currentChanged, MapWidget::instance(), &MapWidget::centerOnIndex);
#endif