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/CreateProfileForm.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/CreateProfileForm.ui.qml')
| -rw-r--r-- | pages/CreateProfileForm.ui.qml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml index e4f2a76..4d46180 100644 --- a/pages/CreateProfileForm.ui.qml +++ b/pages/CreateProfileForm.ui.qml @@ -7,7 +7,11 @@ Rectangle { id: rectangle color: "#fff" +<<<<<<< HEAD property alias enterFullName: enterFullName +======= + property alias backButton: backButton +>>>>>>> 58ed74cd70d6de558b8d9cb77844e95b5f72b341 ToolBar { id: toolbar @@ -29,6 +33,7 @@ Rectangle { spacing: 8 ToolButton { + id: backButton icon.name: "back-icon" icon.source: "/assets/arrow-back-24px.svg" icon.color: "transparent" |