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

core: remove qml properties from desktop compile

Browse source 
add #ifdef SUBSURFACE_MOBILE to secure qml macros are not
compiled with desktop

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-09 12:31:31 +02:00 • committed by Dirk Hohndel
parent f7e8f21245
commit acc9784fd9
2 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/downloadfromdcthread.cpp
View file

@ -277,16 +277,19 @@ QString DCDeviceData::devBluetoothName() const
return m_devBluetoothName;
}
#ifdef SUBSURFACE_MOBILE
QString DCDeviceData::descriptor() const
{
return "";
}
#endif // SUBSURFACE_MOBILE
bool DCDeviceData::bluetoothMode() const
{
return data.bluetooth_mode;
}
#ifdef SUBSURFACE_MOBILE
bool DCDeviceData::forceDownload() const
{
return data.force_download;
@ -306,6 +309,7 @@ int DCDeviceData::diveId() const
{
return data.diveid;
}
#endif // SUBSURFACE_MOBILE
void DCDeviceData::setVendor(const QString& vendor)
{
@ -358,6 +362,7 @@ void DCDeviceData::setCreateNewTrip(bool create)
data.create_new_trip = create;
}
#ifdef SUBSURFACE_MOBILE
void DCDeviceData::setDeviceId(int deviceId)
{
data.deviceid = deviceId;
@ -367,6 +372,7 @@ void DCDeviceData::setDiveId(int diveId)
{
data.diveid = diveId;
}
#endif // SUBSURFACE_MOBILE
void DCDeviceData::setSaveDump(bool save)
{
@ -383,10 +389,13 @@ void DCDeviceData::setSaveLog(bool saveLog)
data.libdc_log = saveLog;
}
#ifdef SUBSURFACE_MOBILE
bool DCDeviceData::saveLog() const
{
return data.libdc_log;
}
#endif // SUBSURFACE_MOBILE
device_data_t* DCDeviceData::internalData()
{