iOS: get rid of ios/Subsurface-mobile

Having a split between ios and ios/Subsurface-mobile is just confusing
and without a practical reason

Move files from ios/Subsurface-mobile to ios and update .gitignore

Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 230 insertions, 0 deletions

diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro
new file mode 100644
index 000000000..c693c448d
--- /dev/null
+++ b/packaging/ios/Subsurface-mobile.pro
@@ -0,0 +1,230 @@
+TEMPLATE = app
+
+QT += qml quick quickcontrols2 widgets positioning concurrent svg bluetooth
+
+DEFINES += SUBSURFACE_MOBILE BT_SUPPORT BLE_SUPPORT
+
+CONFIG += c++11
+
+SOURCES += ../../subsurface-mobile-main.cpp \
+	../../subsurface-mobile-helper.cpp \
+	../../map-widget/qmlmapwidgethelper.cpp \
+	../../core/cloudstorage.cpp \
+	../../core/configuredivecomputerthreads.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 \
+	../../core/configuredivecomputer.cpp \
+	../../core/divecomputer.cpp \
+	../../core/divelogexportlogic.cpp \
+	../../core/divesitehelpers.cpp \
+	../../core/errorhelper.c \
+	../../core/exif.cpp \
+	../../core/format.cpp \
+	../../core/gettextfromc.cpp \
+	../../core/isocialnetworkintegration.cpp \
+	../../core/metrics.cpp \
+	../../core/pluginmanager.cpp \
+	../../core/qt-init.cpp \
+	../../core/subsurfacesysinfo.cpp \
+	../../core/windowtitleupdate.cpp \
+	../../core/file.c \
+	../../core/subsurfacestartup.c \
+	../../core/ios.cpp \
+	../../core/profile.c \
+	../../core/device.c \
+	../../core/dive.c \
+	../../core/divelist.c \
+	../../core/gas-model.c \
+	../../core/gaspressures.c \
+	../../core/git-access.c \
+	../../core/liquivision.c \
+	../../core/load-git.c \
+	../../core/parse-xml.c \
+	../../core/parse.c \
+	../../core/import-suunto.c \
+	../../core/import-shearwater.c \
+	../../core/import-cobalt.c \
+	../../core/import-divinglog.c \
+	../../core/import-csv.c \
+	../../core/save-html.c \
+	../../core/statistics.c \
+	../../core/worldmap-save.c \
+	../../core/libdivecomputer.c \
+	../../core/version.c \
+	../../core/save-git.c \
+	../../core/datatrak.c \
+	../../core/ostctools.c \
+	../../core/planner.c \
+	../../core/save-xml.c \
+	../../core/cochran.c \
+	../../core/deco.c \
+	../../core/divesite.c \
+	../../core/equipment.c \
+	../../core/membuffer.c \
+	../../core/sha1.c \
+	../../core/strtod.c \
+	../../core/taxonomy.c \
+	../../core/time.c \
+	../../core/uemis.c \
+	../../core/btdiscovery.cpp \
+	../../core/connectionlistmodel.cpp \
+	../../core/qt-ble.cpp \
+	../../core/subsurface-qt/CylinderObjectHelper.cpp \
+	../../core/subsurface-qt/DiveObjectHelper.cpp \
+	../../core/subsurface-qt/SettingsObjectWrapper.cpp \
+	../../mobile-widgets/qmlmanager.cpp \
+	../../mobile-widgets/qmlprofile.cpp \
+	../../qt-models/divelistmodel.cpp \
+	../../qt-models/diveplotdatamodel.cpp \
+	../../qt-models/gpslistmodel.cpp \
+	../../qt-models/completionmodels.cpp \
+	../../qt-models/divelocationmodel.cpp \
+	../../qt-models/maplocationmodel.cpp \
+	../../qt-models/diveimportedmodel.cpp \
+	../../qt-models/messagehandlermodel.cpp \
+	../../profile-widget/divecartesianaxis.cpp \
+	../../profile-widget/diveeventitem.cpp \
+	../../profile-widget/diveprofileitem.cpp \
+	../../profile-widget/profilewidget2.cpp \
+	../../profile-widget/ruleritem.cpp \
+	../../profile-widget/animationfunctions.cpp \
+	../../profile-widget/divepixmapitem.cpp \
+	../../profile-widget/divetooltipitem.cpp \
+	../../profile-widget/tankitem.cpp \
+	../../profile-widget/divelineitem.cpp \
+	../../profile-widget/diverectitem.cpp \
+	../../profile-widget/divetextitem.cpp
+
+RESOURCES += ./qml.qrc ../../subsurface.qrc ../../mobile-widgets/qml/mobile-resources.qrc ./translations.qrc
+
+LIBS += ./install-root/lib/libdivecomputer.a \
+	./install-root/lib/libgit2.a \
+	./install-root/lib/libzip.a \
+	./install-root/lib/libxslt.a \
+	./googlemaps-build/libqtgeoservices_googlemaps.a \
+	-liconv \
+	-lsqlite3 \
+	-lxml2
+
+INCLUDEPATH += ./install-root/include/ \
+	./install-root/lib/libzip/include \
+	./install-root/include/libxstl \
+	./install-root/include/libexstl \
+	./install-root/include/openssl \
+	../.. \
+	../../core \
+	../../mobile-widgets/qml/kirigami/src/libkirigami \
+	/usr/include/libxml2
+
+HEADERS += \
+	../../core/libdivecomputer.h \
+	../../core/cloudstorage.h \
+	../../core/configuredivecomputerthreads.h \
+	../../core/device.h \
+	../../core/devicedetails.h \
+	../../core/dive.h \
+	../../core/git-access.h \
+	../../core/gpslocation.h \
+	../../core/helpers.h \
+	../../core/imagedownloader.h \
+	../../core/pref.h \
+	../../core/profile.h \
+	../../core/qthelper.h \
+	../../core/save-html.h \
+	../../core/statistics.h \
+	../../core/units.h \
+	../../core/version.h \
+	../../core/planner.h \
+	../../core/divesite.h \
+	../../core/checkcloudconnection.h \
+	../../core/cochran.h \
+	../../core/color.h \
+	../../core/configuredivecomputer.h \
+	../../core/datatrak.h \
+	../../core/deco.h \
+	../../core/display.h \
+	../../core/divecomputer.h \
+	../../core/divelist.h \
+	../../core/divelogexportlogic.h \
+	../../core/divesitehelpers.h \
+	../../core/exif.h \
+	../../core/file.h \
+	../../core/gaspressures.h \
+	../../core/gettext.h \
+	../../core/gettextfromc.h \
+	../../core/isocialnetworkintegration.h \
+	../../core/membuffer.h \
+	../../core/metrics.h \
+	../../core/pluginmanager.h \
+	../../core/prefs-macros.h \
+	../../core/qt-gui.h \
+	../../core/sha1.h \
+	../../core/strndup.h \
+	../../core/subsurfacestartup.h \
+	../../core/subsurfacesysinfo.h \
+	../../core/taxonomy.h \
+	../../core/uemis.h \
+	../../core/webservice.h \
+	../../core/windowtitleupdate.h \
+	../../core/worldmap-options.h \
+	../../core/worldmap-save.h \
+	../../core/downloadfromdcthread.h \
+	../../core/btdiscovery.h \
+	../../core/connectionlistmodel.h \
+	../../core/qt-ble.h \
+	../../core/subsurface-qt/CylinderObjectHelper.h \
+	../../core/subsurface-qt/DiveObjectHelper.h \
+	../../core/subsurface-qt/SettingsObjectWrapper.h \
+	../../mobile-widgets/qmlmanager.h \
+	../../mobile-widgets/qmlprofile.h \
+	../../map-widget/qmlmapwidgethelper.h \
+	../../qt-models/divelistmodel.h \
+	../../qt-models/diveplotdatamodel.h \
+	../../qt-models/gpslistmodel.h \
+	../../qt-models/divelocationmodel.h \
+	../../qt-models/completionmodels.h \
+	../../qt-models/weightsysteminfomodel.h \
+	../../qt-models/maplocationmodel.h \
+	../../qt-models/diveimportedmodel.h \
+	../../qt-models/messagehandlermodel.h \
+	../../profile-widget/diveprofileitem.h \
+	../../profile-widget/profilewidget2.h \
+	../../profile-widget/ruleritem.h \
+	../../profile-widget/diveeventitem.h \
+	../../profile-widget/divetooltipitem.h \
+	../../profile-widget/tankitem.h \
+	../../profile-widget/animationfunctions.h \
+	../../profile-widget/divecartesianaxis.h \
+	../../profile-widget/divelineitem.h \
+	../../profile-widget/divepixmapitem.h \
+	../../profile-widget/diverectitem.h \
+	../../profile-widget/divetextitem.h
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Default rules for deployment.
+include(./deployment.pri)
+
+include(../../mobile-widgets/qml/kirigami/kirigami.pri)
+
+# Supress some warnings
+QMAKE_CXXFLAGS += -w
+QMAKE_CFLAGS   += -w
+
+ios {
+	QMAKE_ASSET_CATALOGS += ./storeIcon.xcassets
+	app_launch_images.files = ./SubsurfaceMobileLaunch.xib $$files(./SubsurfaceMobileLaunchImage*.png)
+	images.files = ../../icons/subsurface-mobile-icon.png
+	QMAKE_BUNDLE_DATA += app_launch_images images
+	QMAKE_INFO_PLIST = ./Info.plist
+	QMAKE_IOS_DEPLOYMENT_TARGET = 10.0
+}