Merge branch 'develop'

[lichviet] / lichviet.qrc

diff --git a/lichviet.qrc b/lichviet.qrc
index 5b42758..61702b4 100644 (file)
--- a/lichviet.qrc
+++ b/lichviet.qrc
@@ -16,8 +16,10 @@
     <file>qml/LichViet/XemNgayTotXauHoangDao.qml</file>
     <file>qml/LichViet/DateTimeDialog.qml</file>
     <file>qml/LichViet/AmDateTimeDialog.qml</file>s
     <file>qml/LichViet/XemNgayTotXauHoangDao.qml</file>
     <file>qml/LichViet/DateTimeDialog.qml</file>
     <file>qml/LichViet/AmDateTimeDialog.qml</file>s

-    <file>qml/LichViet/NoFeatureDialog.qml</file>

     <file>qml/LichViet/ChangeTheme.qml</file>
     <file>qml/LichViet/ChangeTheme.qml</file>

+    <file>qml/LichViet/MenuButton.qml</file>
+    <file>qml/LichViet/ScrollBar.qml</file>
+    <file>qml/LichViet/FileBrowser.qml</file>

     <file>qml/DatePicker/component/Button.qml</file>
     <file>qml/DatePicker/component/DateReel.qml</file>
     <file>qml/DatePicker/component/Reel.qml</file>
     <file>qml/DatePicker/component/Button.qml</file>
     <file>qml/DatePicker/component/DateReel.qml</file>
     <file>qml/DatePicker/component/Reel.qml</file>

@@ -29,6 +31,7 @@
     <file>qml/LichViet/Settings.js</file>
     <file>qml/LichViet/Themes.js</file>
     <file>qml/LichViet/xemngaytotxau.js</file>
     <file>qml/LichViet/Settings.js</file>
     <file>qml/LichViet/Themes.js</file>
     <file>qml/LichViet/xemngaytotxau.js</file>

+    <file>qml/LichViet/main.js</file>

     <file>qml/LichViet/CacNgayLeTrongNam.js</file>
 </qresource>
 
     <file>qml/LichViet/CacNgayLeTrongNam.js</file>
 </qresource>