summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2017-06-01 21:39:26 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-06-01 14:33:41 -0700
commitec34ebfb040edbd5c4f36982e610100d005cfe06 (patch)
tree8938e7c67b1e7af519f8f07d86677ffba8e9b768 /packaging
parentf5adbe566235a0b9b7ea0ab978d89aebef8fc8ec (diff)
downloadsubsurface-ec34ebfb040edbd5c4f36982e610100d005cfe06.tar.gz
Enable BT for iOS build
and add some new source files to .pro file Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/ios/Subsurface-mobile/Subsurface-mobile.pro11
-rw-r--r--packaging/ios/Subsurface-mobile/dummy.qml1
2 files changed, 10 insertions, 2 deletions
diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
index 12356e165..29da480ff 100644
--- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
@@ -1,8 +1,8 @@
TEMPLATE = app
-QT += qml quick quickcontrols2 widgets positioning concurrent svg
+QT += qml quick quickcontrols2 widgets positioning concurrent svg bluetooth
-DEFINES += SUBSURFACE_MOBILE
+DEFINES += SUBSURFACE_MOBILE BT_SUPPORT
CONFIG += c++11
@@ -13,6 +13,10 @@ SOURCES += ../../../subsurface-mobile-main.cpp \
../../../core/devicedetails.cpp \
../../../core/gpslocation.cpp \
../../../core/imagedownloader.cpp \
+ ../../../core/downloadfromdcthread.cpp \
+ ../../../core/qtserialbluetooth.cpp \
+ ../../../core/plannernotes.c \
+ ../../../core/uemis-downloader.c \
../../../core/qthelper.cpp \
../../../core/checkcloudconnection.cpp \
../../../core/color.cpp \
@@ -81,6 +85,7 @@ SOURCES += ../../../subsurface-mobile-main.cpp \
../../../qt-models/divepicturemodel.cpp \
../../../qt-models/divesitepicturesmodel.cpp \
../../../qt-models/divetripmodel.cpp \
+ ../../../qt-models/diveimportedmodel.cpp \
../../../qt-models/filtermodels.cpp \
../../../qt-models/models.cpp \
../../../qt-models/tankinfomodel.cpp \
@@ -176,6 +181,7 @@ HEADERS += \
../../../core/windowtitleupdate.h \
../../../core/worldmap-options.h \
../../../core/worldmap-save.h \
+ ../../../core/downloadfromdcthread.h \
../../../core/subsurface-qt/CylinderObjectHelper.h \
../../../core/subsurface-qt/DiveObjectHelper.h \
../../../core/subsurface-qt/SettingsObjectWrapper.h \
@@ -202,6 +208,7 @@ HEADERS += \
../../../qt-models/tankinfomodel.h \
../../../qt-models/treemodel.h \
../../../qt-models/yearlystatisticsmodel.h \
+ ../../../qt-models/diveimportedmodel.h \
../../../profile-widget/diveprofileitem.h \
../../../profile-widget/profilewidget2.h \
../../../profile-widget/ruleritem.h \
diff --git a/packaging/ios/Subsurface-mobile/dummy.qml b/packaging/ios/Subsurface-mobile/dummy.qml
index aaf0a7984..96a1e3745 100644
--- a/packaging/ios/Subsurface-mobile/dummy.qml
+++ b/packaging/ios/Subsurface-mobile/dummy.qml
@@ -9,6 +9,7 @@ import QtQuick.Layouts 1.2
import QtQuick.Window 2.2
import QtGraphicalEffects 1.0
import QtQml.Models 2.1
+import QtBluetooth 5.2
ApplicationWindow {