Merge branch 'develop'

[lichviet] / LichViet.pro

diff --git a/LichViet.pro b/LichViet.pro
index 5e1e4da..06f3e1b 100644 (file)
--- a/LichViet.pro
+++ b/LichViet.pro
@@ -8,6 +8,7 @@ themes_qml.source = qml/themes
 themes_qml.target = /
 DEPLOYMENTFOLDERS = themes_qml
 
+QT += dbus
 
 # Additional import path used to resolve QML modules in Creator's code model
 #QML_IMPORT_PATH =
@@ -29,7 +30,7 @@ DEPLOYMENTFOLDERS = themes_qml
 
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp \
-    lunarcalendar.cpp
+    controller.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 include(qmlapplicationviewer/qmlapplicationviewer.pri)
@@ -39,7 +40,7 @@ RESOURCES += \
     lichviet.qrc
 
 HEADERS += \
-    lunarcalendar.h
+    controller.h
 
 OTHER_FILES += \
     debian/changelog \
@@ -58,7 +59,6 @@ OTHER_FILES += \
     qml/LichViet/TitleBar.qml \
     qml/LichViet/Switch.qml \
     qml/LichViet/OptionsScreen.qml \
-    qml/LichViet/NoFeatureDialog.qml \
     qml/LichViet/MultiTitleBar.qml \
     qml/LichViet/MenuScreen.qml \
     qml/LichViet/main.qml \
@@ -68,4 +68,30 @@ OTHER_FILES += \
     qml/LichViet/About.qml \
     qml/LichViet/amlich-aa98.js \
     qml/LichViet/AmDateTimeDialog.qml \
-    qml/LichViet/xemngaytotxau.js
+    qml/LichViet/xemngaytotxau.js \
+    qml/LichViet/CacNgayLeTrongNam.js \
+    qml/LichViet/ChangeTheme.qml \
+    qml/LichViet/MenuButton.qml \
+    qml/LichViet/ScrollBar.qml \
+    qml/LichViet/FileBrowser.qml \
+    qml/LichViet/main.js
+
+unix:!symbian:!maemo5 {
+    target.path = /opt/LichViet/bin
+    INSTALLS += target
+}
+
+unix:!symbian:!maemo5 {
+    target.path = /opt/LichViet/bin
+    INSTALLS += target
+}
+
+unix:!symbian:!maemo5 {
+    target.path = /opt/LichViet/bin
+    INSTALLS += target
+}
+
+maemo5 {
+    target.path = /opt/LichViet/bin
+    INSTALLS += target
+}