diff options
-rw-r--r-- | packaging/ios/Subsurface-mobile/MainForm.ui.qml | 25 | ||||
-rw-r--r-- | packaging/ios/Subsurface-mobile/dummy.qml | 13 | ||||
-rw-r--r-- | packaging/ios/Subsurface-mobile/main.qml | 40 | ||||
-rw-r--r-- | packaging/ios/Subsurface-mobile/qml.qrc | 3 |
4 files changed, 14 insertions, 67 deletions
diff --git a/packaging/ios/Subsurface-mobile/MainForm.ui.qml b/packaging/ios/Subsurface-mobile/MainForm.ui.qml deleted file mode 100644 index 7913bb2b8..000000000 --- a/packaging/ios/Subsurface-mobile/MainForm.ui.qml +++ /dev/null @@ -1,25 +0,0 @@ -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") - } - } -} diff --git a/packaging/ios/Subsurface-mobile/dummy.qml b/packaging/ios/Subsurface-mobile/dummy.qml new file mode 100644 index 000000000..12dff8596 --- /dev/null +++ b/packaging/ios/Subsurface-mobile/dummy.qml @@ -0,0 +1,13 @@ +// dummy file that tells the iOS build which dependencies +// are needed at runtim +import QtQuick 2.5 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.2 +import QtQuick.Window 2.2 +import QtWebView 1.0 + +ApplicationWindow { + +} diff --git a/packaging/ios/Subsurface-mobile/main.qml b/packaging/ios/Subsurface-mobile/main.qml deleted file mode 100644 index 26b1a7998..000000000 --- a/packaging/ios/Subsurface-mobile/main.qml +++ /dev/null @@ -1,40 +0,0 @@ -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(); - } - } -} diff --git a/packaging/ios/Subsurface-mobile/qml.qrc b/packaging/ios/Subsurface-mobile/qml.qrc index 7684346a5..4aad1f267 100644 --- a/packaging/ios/Subsurface-mobile/qml.qrc +++ b/packaging/ios/Subsurface-mobile/qml.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/"> - <file>main.qml</file> - <file>MainForm.ui.qml</file> + <file>dummy.qml</file> </qresource> </RCC> |