mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
iOS build: add various support files
It's unclear why the build fails if we don't add the sample app files as well. [Dirk Hohndel: refactored the patches] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
74e6e0ed37
commit
710b3615fe
9 changed files with 357 additions and 106 deletions
25
packaging/ios/subsurface-ios/MainForm.ui.qml
Normal file
25
packaging/ios/subsurface-ios/MainForm.ui.qml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
import QtQuick 2.6
|
||||
import QtQuick.Controls 1.5
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
Item {
|
||||
width: 640
|
||||
height: 480
|
||||
|
||||
property alias button1: button1
|
||||
property alias button2: button2
|
||||
|
||||
RowLayout {
|
||||
anchors.centerIn: parent
|
||||
|
||||
Button {
|
||||
id: button1
|
||||
text: qsTr("Press Me 1")
|
||||
}
|
||||
|
||||
Button {
|
||||
id: button2
|
||||
text: qsTr("Press Me 2")
|
||||
}
|
||||
}
|
||||
}
|
||||
13
packaging/ios/subsurface-ios/deployment.pri
Normal file
13
packaging/ios/subsurface-ios/deployment.pri
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
unix:!android {
|
||||
isEmpty(target.path) {
|
||||
qnx {
|
||||
target.path = /tmp/$${TARGET}/bin
|
||||
} else {
|
||||
target.path = /opt/$${TARGET}/bin
|
||||
}
|
||||
export(target.path)
|
||||
}
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
export(INSTALLS)
|
||||
40
packaging/ios/subsurface-ios/main.qml
Normal file
40
packaging/ios/subsurface-ios/main.qml
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
import QtQuick 2.6
|
||||
import QtQuick.Controls 1.5
|
||||
import QtQuick.Dialogs 1.2
|
||||
|
||||
ApplicationWindow {
|
||||
visible: true
|
||||
width: 640
|
||||
height: 480
|
||||
title: qsTr("Hello World")
|
||||
|
||||
menuBar: MenuBar {
|
||||
Menu {
|
||||
title: qsTr("File")
|
||||
MenuItem {
|
||||
text: qsTr("&Open")
|
||||
onTriggered: console.log("Open action triggered");
|
||||
}
|
||||
MenuItem {
|
||||
text: qsTr("Exit")
|
||||
onTriggered: Qt.quit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MainForm {
|
||||
anchors.fill: parent
|
||||
button1.onClicked: messageDialog.show(qsTr("Button 1 pressed"))
|
||||
button2.onClicked: messageDialog.show(qsTr("Button 2 pressed"))
|
||||
}
|
||||
|
||||
MessageDialog {
|
||||
id: messageDialog
|
||||
title: qsTr("May I have your attention, please?")
|
||||
|
||||
function show(caption) {
|
||||
messageDialog.text = caption;
|
||||
messageDialog.open();
|
||||
}
|
||||
}
|
||||
}
|
||||
6
packaging/ios/subsurface-ios/qml.qrc
Normal file
6
packaging/ios/subsurface-ios/qml.qrc
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>main.qml</file>
|
||||
<file>MainForm.ui.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
220
packaging/ios/subsurface-ios/subsurface-ios.pro
Normal file
220
packaging/ios/subsurface-ios/subsurface-ios.pro
Normal file
|
|
@ -0,0 +1,220 @@
|
|||
TEMPLATE = app
|
||||
|
||||
QT += qml quick widgets positioning concurrent
|
||||
|
||||
DEFINES += SUBSURFACE_MOBILE
|
||||
|
||||
CONFIG += c++11
|
||||
|
||||
SOURCES += ../../../subsurface-mobile-main.cpp \
|
||||
../../../subsurface-mobile-helper.cpp \
|
||||
../../../subsurface-core/cloudstorage.cpp \
|
||||
../../../subsurface-core/configuredivecomputerthreads.cpp \
|
||||
../../../subsurface-core/devicedetails.cpp \
|
||||
../../../subsurface-core/gpslocation.cpp \
|
||||
../../../subsurface-core/imagedownloader.cpp \
|
||||
../../../subsurface-core/qthelper.cpp \
|
||||
../../../subsurface-core/checkcloudconnection.cpp \
|
||||
../../../subsurface-core/color.cpp \
|
||||
../../../subsurface-core/configuredivecomputer.cpp \
|
||||
../../../subsurface-core/divecomputer.cpp \
|
||||
../../../subsurface-core/divelogexportlogic.cpp \
|
||||
../../../subsurface-core/divesite.cpp \
|
||||
../../../subsurface-core/divesitehelpers.cpp \
|
||||
../../../subsurface-core/exif.cpp \
|
||||
../../../subsurface-core/gettextfromc.cpp \
|
||||
../../../subsurface-core/isocialnetworkintegration.cpp \
|
||||
../../../subsurface-core/metrics.cpp \
|
||||
../../../subsurface-core/pluginmanager.cpp \
|
||||
../../../subsurface-core/qt-init.cpp \
|
||||
../../../subsurface-core/subsurfacesysinfo.cpp \
|
||||
../../../subsurface-core/windowtitleupdate.cpp \
|
||||
../../../subsurface-core/file.c \
|
||||
../../../subsurface-core/subsurfacestartup.c \
|
||||
../../../subsurface-core/macos.c \
|
||||
../../../subsurface-core/profile.c \
|
||||
../../../subsurface-core/device.c \
|
||||
../../../subsurface-core/dive.c \
|
||||
../../../subsurface-core/divelist.c \
|
||||
../../../subsurface-core/gas-model.c \
|
||||
../../../subsurface-core/gaspressures.c \
|
||||
../../../subsurface-core/git-access.c \
|
||||
../../../subsurface-core/liquivision.c \
|
||||
../../../subsurface-core/load-git.c \
|
||||
../../../subsurface-core/parse-xml.c \
|
||||
../../../subsurface-core/save-html.c \
|
||||
../../../subsurface-core/statistics.c \
|
||||
../../../subsurface-core/worldmap-save.c \
|
||||
../../../subsurface-core/libdivecomputer.c \
|
||||
../../../subsurface-core/version.c \
|
||||
../../../subsurface-core/save-git.c \
|
||||
../../../subsurface-core/datatrak.c \
|
||||
../../../subsurface-core/ostctools.c \
|
||||
../../../subsurface-core/planner.c \
|
||||
../../../subsurface-core/save-xml.c \
|
||||
../../../subsurface-core/cochran.c \
|
||||
../../../subsurface-core/deco.c \
|
||||
../../../subsurface-core/divesite.c \
|
||||
../../../subsurface-core/equipment.c \
|
||||
../../../subsurface-core/membuffer.c \
|
||||
../../../subsurface-core/sha1.c \
|
||||
../../../subsurface-core/strtod.c \
|
||||
../../../subsurface-core/taxonomy.c \
|
||||
../../../subsurface-core/time.c \
|
||||
../../../subsurface-core/uemis.c \
|
||||
../../../subsurface-core/subsurface-qt/DiveObjectHelper.cpp \
|
||||
../../../subsurface-core/subsurface-qt/SettingsObjectWrapper.cpp \
|
||||
../../../qt-mobile/qmlmanager.cpp \
|
||||
../../../qt-mobile/qmlprofile.cpp \
|
||||
../../../qt-models/cylindermodel.cpp \
|
||||
../../../qt-models/divelistmodel.cpp \
|
||||
../../../qt-models/diveplotdatamodel.cpp \
|
||||
../../../qt-models/gpslistmodel.cpp \
|
||||
../../../qt-models/yearlystatisticsmodel.cpp \
|
||||
../../../qt-models/diveplannermodel.cpp \
|
||||
../../../qt-models/cleanertablemodel.cpp \
|
||||
../../../qt-models/completionmodels.cpp \
|
||||
../../../qt-models/divecomputerextradatamodel.cpp \
|
||||
../../../qt-models/divecomputermodel.cpp \
|
||||
../../../qt-models/divelocationmodel.cpp \
|
||||
../../../qt-models/divepicturemodel.cpp \
|
||||
../../../qt-models/divesitepicturesmodel.cpp \
|
||||
../../../qt-models/divetripmodel.cpp \
|
||||
../../../qt-models/filtermodels.cpp \
|
||||
../../../qt-models/models.cpp \
|
||||
../../../qt-models/tankinfomodel.cpp \
|
||||
../../../qt-models/treemodel.cpp \
|
||||
../../../qt-models/weightmodel.cpp \
|
||||
../../../qt-models/weigthsysteminfomodel.cpp \
|
||||
../../../qt-models/ssrfsortfilterproxymodel.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 ../../../qt-mobile/qml/mobile-resources.qrc
|
||||
|
||||
LIBS += ../install-root/lib/libcrypto.a \
|
||||
../install-root/lib/libdivecomputer.a \
|
||||
../install-root/lib/libgit2.a \
|
||||
../install-root/lib/libsqlite3.a \
|
||||
../install-root/lib/libzip.a \
|
||||
../install-root/lib/libxslt.a \
|
||||
../install-root/lib/libxml2.a \
|
||||
../install-root/lib/libssh2.a \
|
||||
../install-root/lib/libssl.a \
|
||||
-liconv
|
||||
|
||||
INCLUDEPATH += ../install-root/include/ \
|
||||
../install-root/lib/libzip/include \
|
||||
../install-root/include/libxml2 \
|
||||
../install-root/include/libxstl \
|
||||
../install-root/include/libexstl \
|
||||
../install-root/include/openssl \
|
||||
../../.. \
|
||||
../../../subsurface-core
|
||||
|
||||
HEADERS += \
|
||||
../../../subsurface-core/libdivecomputer.h \
|
||||
../../../subsurface-core/cloudstorage.h \
|
||||
../../../subsurface-core/configuredivecomputerthreads.h \
|
||||
../../../subsurface-core/device.h \
|
||||
../../../subsurface-core/devicedetails.h \
|
||||
../../../subsurface-core/dive.h \
|
||||
../../../subsurface-core/git-access.h \
|
||||
../../../subsurface-core/gpslocation.h \
|
||||
../../../subsurface-core/helpers.h \
|
||||
../../../subsurface-core/imagedownloader.h \
|
||||
../../../subsurface-core/pref.h \
|
||||
../../../subsurface-core/profile.h \
|
||||
../../../subsurface-core/qthelper.h \
|
||||
../../../subsurface-core/save-html.h \
|
||||
../../../subsurface-core/statistics.h \
|
||||
../../../subsurface-core/units.h \
|
||||
../../../subsurface-core/qthelperfromc.h \
|
||||
../../../subsurface-core/version.h \
|
||||
../../../subsurface-core/planner.h \
|
||||
../../../subsurface-core/divesite.h \
|
||||
../../../subsurface-core/checkcloudconnection.h \
|
||||
../../../subsurface-core/cochran.h \
|
||||
../../../subsurface-core/color.h \
|
||||
../../../subsurface-core/configuredivecomputer.h \
|
||||
../../../subsurface-core/datatrak.h \
|
||||
../../../subsurface-core/deco.h \
|
||||
../../../subsurface-core/display.h \
|
||||
../../../subsurface-core/divecomputer.h \
|
||||
../../../subsurface-core/divelist.h \
|
||||
../../../subsurface-core/divelogexportlogic.h \
|
||||
../../../subsurface-core/divesitehelpers.h \
|
||||
../../../subsurface-core/exif.h \
|
||||
../../../subsurface-core/file.h \
|
||||
../../../subsurface-core/gaspressures.h \
|
||||
../../../subsurface-core/gettext.h \
|
||||
../../../subsurface-core/gettextfromc.h \
|
||||
../../../subsurface-core/isocialnetworkintegration.h \
|
||||
../../../subsurface-core/membuffer.h \
|
||||
../../../subsurface-core/metrics.h \
|
||||
../../../subsurface-core/pluginmanager.h \
|
||||
../../../subsurface-core/prefs-macros.h \
|
||||
../../../subsurface-core/qt-gui.h \
|
||||
../../../subsurface-core/sha1.h \
|
||||
../../../subsurface-core/strndup.h \
|
||||
../../../subsurface-core/subsurfacestartup.h \
|
||||
../../../subsurface-core/subsurfacesysinfo.h \
|
||||
../../../subsurface-core/taxonomy.h \
|
||||
../../../subsurface-core/uemis.h \
|
||||
../../../subsurface-core/webservice.h \
|
||||
../../../subsurface-core/windowtitleupdate.h \
|
||||
../../../subsurface-core/worldmap-options.h \
|
||||
../../../subsurface-core/worldmap-save.h \
|
||||
../../../subsurface-core/subsurface-qt/DiveObjectHelper.h \
|
||||
../../../subsurface-core/subsurface-qt/SettingsObjectWrapper.h \
|
||||
../../../qt-mobile/qmlmanager.h \
|
||||
../../../qt-mobile/qmlprofile.h \
|
||||
../../../qt-models/divelistmodel.h \
|
||||
../../../qt-models/diveplotdatamodel.h \
|
||||
../../../qt-models/gpslistmodel.h \
|
||||
../../../qt-models/divelocationmodel.h \
|
||||
../../../qt-models/cylindermodel.h \
|
||||
../../../qt-models/divecomputermodel.h \
|
||||
../../../qt-models/diveplannermodel.h \
|
||||
../../../qt-models/divetripmodel.h \
|
||||
../../../qt-models/models.h \
|
||||
../../../qt-models/weightmodel.h \
|
||||
../../../qt-models/cleanertablemodel.h \
|
||||
../../../qt-models/divepicturemodel.h \
|
||||
../../../qt-models/ssrfsortfilterproxymodel.h \
|
||||
../../../qt-models/divesitepicturesmodel.h \
|
||||
../../../qt-models/completionmodels.h \
|
||||
../../../qt-models/weigthsysteminfomodel.h \
|
||||
../../../qt-models/divecomputerextradatamodel.h \
|
||||
../../../qt-models/filtermodels.h \
|
||||
../../../qt-models/tankinfomodel.h \
|
||||
../../../qt-models/treemodel.h \
|
||||
../../../qt-models/yearlystatisticsmodel.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)
|
||||
Loading…
Add table
Add a link
Reference in a new issue