diff options
| author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-31 12:17:07 +0700 |
|---|---|---|
| committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-31 12:17:07 +0700 |
| commit | 5ae553405369ad61678bd5596e3264b595109fcd (patch) | |
| tree | 4e9c61e7fe1e55a261853fff161a155e70678e1a /pages/ConfirmPasswordForm.ui.qml | |
| parent | be656ae46d2479eedda714b9248a06383760b4c2 (diff) | |
| parent | 58ed74cd70d6de558b8d9cb77844e95b5f72b341 (diff) | |
Merge branch 'master' of ssh://darapsa.co.id/usr/local/git/kelakon into development
* 'master' of ssh://darapsa.co.id/usr/local/git/kelakon:
Fixed the android debug label library name
Set up flows from password form to profile creation form
# Conflicts:
# pages/CreateProfileForm.ui.qml
Diffstat (limited to 'pages/ConfirmPasswordForm.ui.qml')
| -rw-r--r-- | pages/ConfirmPasswordForm.ui.qml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pages/ConfirmPasswordForm.ui.qml b/pages/ConfirmPasswordForm.ui.qml index 152b7e5..34e03ef 100644 --- a/pages/ConfirmPasswordForm.ui.qml +++ b/pages/ConfirmPasswordForm.ui.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.12 import QtQuick.Controls 2.12 import QtQuick.Controls.Material 2.12 @@ -116,11 +116,3 @@ Rectangle { Material.background: Material.primary } } - - - - -/*##^## Designer { - D{i:0;autoSize:true;height:480;width:640} -} - ##^##*/ |