Version 0.7-0

[vicar] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index a0b7ed3..597e8b5 100755 (executable)
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,38 +2,64 @@ TEMPLATE = subdirs
 CONFIG += ordered\r
 SUBDIRS  += vicar-lib\r
 SUBDIRS  += vicar-daemon\r
-SUBDIRS  += vicar-config\r
+\r
+contains(MEEGO_EDITION,harmattan){\r
+    SUBDIRS  += vicar-config-qml\r
+}\r
+else{\r
+    SUBDIRS  += vicar-config\r
+}\r
+\r
 SUBDIRS  += vicar-telepathy\r
 SUBDIRS  += vicar-utils\r
 \r
 #MAKE INSTALL\r
 \r
-INSTALLS += desktop service manager profile icon26 icon32 icon48 icon64 scalable\r
+INSTALLS += desktop dbus_service tp_connmanager rtcom_profile icon26 icon32 icon48 icon64 appicon\r
+\r
+dbus_service.path = /usr/share/dbus-1/services\r
+dbus_service.files = data/dbus/org.maemo.vicar.service\r
+dbus_service.files += data/dbus/org.freedesktop.Telepathy.ConnectionManager.vicar.service\r
+\r
+tp_connmanager.path = /usr/share/telepathy/managers\r
+tp_connmanager.files = data/telepathy/vicar.manager\r
+\r
+rtcom_profile.path = /usr/share/osso-rtcom\r
+rtcom_profile.files = data/telepathy/vicar.profile\r
+\r
+icon26.path = /usr/share/icons/hicolor/26x26/apps\r
+icon26.files += data/icons/26x26/vicar_harmattan.png\r
+\r
+icon32.path = /usr/share/icons/hicolor/32x32/apps\r
+icon32.files += data/icons/32x32/vicar_harmattan.png\r
 \r
-desktop.path = /usr/share/applications/hildon\r
-desktop.files += data/vicar-config.desktop\r
+icon48.path = /usr/share/icons/hicolor/48x48/apps\r
+icon48.files += data/icons/48x48/vicar_harmattan.png\r
 \r
-service.path = /usr/share/dbus-1/services\r
-service.files = data/org.maemo.vicar.service\r
-service.files += data/org.freedesktop.Telepathy.ConnectionManager.vicar.service\r
+icon64.path = /usr/share/icons/hicolor/64x64/apps\r
+icon64.files += data/icons/64x64/vicar_harmattan.png\r
 \r
-manager.path = /usr/share/telepathy/managers\r
-manager.files = data/vicar.manager\r
+appicon.path = /usr/share/icons/hicolor/80x80/apps\r
+appicon.files += data/icons/vicar_harmattan.png\r
 \r
-profile.path = /usr/share/osso-rtcom\r
-profile.files = data/vicar.profile\r
+contains(MEEGO_EDITION,harmattan){\r
+#Install files required for Harmattan Accounts framework\r
+    INSTALLS += account_provider account_service account_icon\r
 \r
-icon26.path = /opt/usr/share/icons/hicolor/26x26/apps\r
-icon26.files += data/icons/26x26/vicar_phone.png\r
+    account_provider.path = /usr/share/accounts/providers\r
+    account_provider.files += data/accounts/vicar.provider\r
 \r
-icon32.path = /opt/usr/share/icons/hicolor/32x32/apps\r
-icon32.files += data/icons/32x32/vicar_phone.png\r
+    account_service.path = /usr/share/accounts/services\r
+    account_service.files += data/accounts/vicar.service\r
 \r
-icon48.path = /opt/usr/share/icons/hicolor/48x48/apps\r
-icon48.files += data/icons/48x48/vicar_phone.png\r
+    account_icon.path = /usr/share/themes/blanco/meegotouch/icons\r
+    account_icon.files += data/icons/icon-m-service-vicar.png\r
 \r
-icon64.path = /opt/usr/share/icons/hicolor/64x64/apps\r
-icon64.files += data/icons/64x64/vicar_phone.png\r
+    desktop.path = /usr/share/applications\r
+    desktop.files += data/desktop/vicar-config-qml.desktop\r
+}\r
 \r
-scalable.path = /opt/usr/share/icons/hicolor/scalable/apps\r
-scalable.files += data/icons/vicar_scalable_icon.png\r
+maemo5 | exists(/usr/bin/hildon-home) {\r
+    desktop.path = /usr/share/applications/hildon\r
+    desktop.files += data/desktop/vicar-config.desktop\r
+}\r