diff options
| author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-09-24 15:24:10 +0700 |
|---|---|---|
| committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-09-24 15:24:10 +0700 |
| commit | 91640a2222eeca5e424ac27bc93514e56a2d5c56 (patch) | |
| tree | 9111f2671ccb1cfc6f60b43c60259674b7f3bc87 /kelakon.qrc | |
| parent | 6554c14faf89679915a2c3c9e74242c6d4b8b72b (diff) | |
| parent | b4a7a55b35b441d7e4e4acd83e85f2c21961f9b6 (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:
Task related forms are moved to Larva
Task list element pushes to task details
Diffstat (limited to 'kelakon.qrc')
| -rw-r--r-- | kelakon.qrc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kelakon.qrc b/kelakon.qrc index 0409170..d36e0d8 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -19,11 +19,12 @@ <file>CreateProfile.qml</file> <file>pages/CreateProfileForm.ui.qml</file> <file>Home.qml</file> - <file>forms/HomeForm.ui.qml</file> - <file>forms/DayListForm.ui.qml</file> + <file>larva/features/HomeForm.ui.qml</file> + <file>larva/features/DayListForm.ui.qml</file> <file>TaskList.qml</file> - <file>forms/TaskListForm.ui.qml</file> - <file>forms/TaskForm.ui.qml</file> + <file>TaskDetails.qml</file> + <file>larva/features/TaskListForm.ui.qml</file> + <file>larva/features/TaskForm.ui.qml</file> <file>assets/photo_camera_24px.svg</file> <file>assets/menu-24px.svg</file> <file>assets/check-box-outline-24px.svg</file> @@ -33,7 +34,6 @@ <file>assets/user-24px.svg</file> <file>qtquickcontrols2.conf</file> <file>larva/features/EnterPasswordForm.ui.qml</file> - <file>larva/features/HomeForm.ui.qml</file> <file>assets/arrow-back-24px.svg</file> <file>onboarding-1.png</file> <file>larva/features/ProfileForm.ui.qml</file> |