summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Prabowo Kamal <erik@darapsa.co.id>2019-08-26 11:49:43 +0800
committerErik Prabowo Kamal <erik@darapsa.co.id>2019-08-26 11:49:43 +0800
commit9716f5aab10be667878942cb5c89a7433a420086 (patch)
treecd6ff06d48c9d8dec63545c46bee92573c44357c
parent7eb0a91a4895bc820679f2ba2bdec5518605fd0f (diff)
parent0791cac4bc4bd9fd6224f82efcdf07e9973a679d (diff)
Merge branch 'master' into curl
-rw-r--r--Login.qml3
-rw-r--r--main.qml22
2 files changed, 9 insertions, 16 deletions
diff --git a/Login.qml b/Login.qml
index 1e450ce..d39c60d 100644
--- a/Login.qml
+++ b/Login.qml
@@ -1,9 +1,6 @@
import QtQuick 2.12
LoginForm {
- width: appWindow.width
- height: appWindow.height
-
emailButton {
onClicked: {
stackView.push("qrc:/pages/Email.qml")
diff --git a/main.qml b/main.qml
index 8fbb800..e0ee73f 100644
--- a/main.qml
+++ b/main.qml
@@ -2,17 +2,13 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
ApplicationWindow {
- id: appWindow
- width: 362
- height: 628
- visible: true
-
- StackView {
- id: stackView
- width: 362
- height: 628
-
- initialItem: Login {}
- }
-
+ id: appWindow
+ width: 360
+ height: 640
+ visible: true
+
+ StackView {
+ id: stackView
+ initialItem: Login {}
+ }
}