mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Desktop: Fix build for Qt6

Browse source 
This seems to be needed to make the build work with Qt6, which is needed for M1 based Macs.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2023-04-24 17:31:25 +12:00 committed by bstoeger
parent e60baff940
commit 15bf145f14
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-models/divelocationmodel.cpp
View file

@ -91,11 +91,11 @@ QVariant LocationInformationModel::getDiveSiteData(const struct dive_site *ds, i
case Qt::DisplayRole: case Qt::DisplayRole:
switch(column) { switch(column) {
case DIVESITE: return QVariant::fromValue<dive_site *>((dive_site *)ds); // Not nice: casting away const case DIVESITE: return QVariant::fromValue<dive_site *>((dive_site *)ds); // Not nice: casting away const
case NAME: return ds->name; case NAME: return QString(ds->name);
case NUM_DIVES: return ds->dives.nr; case NUM_DIVES: return ds->dives.nr;
case LOCATION: return "TODO"; case LOCATION: return "TODO";
case DESCRIPTION: return ds->description; case DESCRIPTION: return QString(ds->description);
case NOTES: return ds->name; case NOTES: return QString(ds->name);
case TAXONOMY: return "TODO"; case TAXONOMY: return "TODO";
} }
break; break;

4
qt-models/divesiteimportmodel.cpp
View file

@ -59,7 +59,7 @@ QVariant DivesiteImportedModel::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
switch (index.column()) { switch (index.column()) {
case NAME: case NAME:
return ds->name; return QString(ds->name);
case LOCATION: case LOCATION:
return printGPSCoords(&ds->location); return printGPSCoords(&ds->location);
case COUNTRY: case COUNTRY:
@ -70,7 +70,7 @@ QVariant DivesiteImportedModel::data(const QModelIndex &index, int role) const
get_dive_site_by_gps_proximity(&ds->location, get_dive_site_by_gps_proximity(&ds->location,
40075000, divelog.sites); 40075000, divelog.sites);
if (nearest_ds) if (nearest_ds)
return nearest_ds->name; return QString(nearest_ds->name);
else else
return QString(); return QString();
} }

2
qt-models/yearlystatisticsmodel.cpp
View file

@ -54,7 +54,7 @@ QVariant YearStatisticsItem::data(int column, int role) const
switch (column) { switch (column) {
case YEAR: case YEAR:
if (stats_interval.is_trip) { if (stats_interval.is_trip) {
ret = stats_interval.location; ret = QString(stats_interval.location);
} else { } else {
ret = stats_interval.period; ret = stats_interval.period;
} }