Merge branch 'mr/feature/gitlab-ci' into 'master'

Add .gitlab-ci.yml

See merge request remotewebapp/rwa.support.desktopapp!2

1 files changed, 0 insertions, 70 deletions

diff --git a/src/scenes/add_server_wizard/Scene_step_2.qml b/src/scenes/add_server_wizard/Scene_step_2.qml
deleted file mode 100644
index 5cfbe46..0000000
--- a/src/scenes/add_server_wizard/Scene_step_2.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Window 2.2
-import QtQuick.Extras 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls.Material 2.3
-
-/*!
-  This .qml file is a Scene which can be loaded through for example a StackView (main_content in main.qml).
-  */
-
-Item {
-    id: scene_server_wizard_step_2
-    objectName: "Scene_step_2"
-
-    Connections {
-        target: add_server_wizard
-        onStep2Success: {
-            main_content_pop(null, StackView.Transition)
-            //main_content_replace("scenes/Scene_placeholder.qml", StackView.Transition)
-        }
-    }
-
-    Connections {
-        target: add_server_wizard
-        onStep2Failed: {
-            mainqmladaptor.showToast(reason, 3000);
-        }
-    }
-
-    Rectangle {
-        id: rectangle
-        anchors.fill: parent
-        color: Material.background
-
-        Text {
-            color: Material.foreground
-            id: title
-
-            text: qsTr("Step 2")
-            font.pointSize: 18
-            wrapMode: Text.WordWrap
-
-            font.bold: true
-            horizontalAlignment: Text.AlignHCenter
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.margins: 5
-        }
-
-        Button {
-            id: next_step2_button
-            text: qsTr("Next Step")
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 10
-            anchors.right: parent.right
-            anchors.rightMargin: 10
-
-            onClicked: {
-                add_server_wizard.processStep2()
-            }
-        }
-    }
-}
-
-/*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/