Merge branch 'master' into webkit

Conflicts:
	trunk/src/base/base.pro

diff --cc trunk/src/base/base.pro
index 5119976,f1086ab..cc2e3cf
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -6,7 -6,8 +6,9 @@@ QT += core 
      sql \
      xml \
      xmlpatterns \
-     webkit
++    webkit \
+     dbus
+ 
  maemo5:QT += maemo5
  TARGET = mdictionary
  TEMPLATE = app
@@@ -75,7 -77,8 +79,9 @@@ unix 
      INSTALLS += target \
          desktop \
          icon64 \
-         bookmarks
++        bookmarks \
+         service
+ 
      target.path = $$BINDIR
      maemo5 { 
          desktop.path = $$DATADIR/applications/hildon
@@@ -87,7 -90,8 +93,11 @@@
      }
      desktop.files += ../../../data/other/$${TARGET}.desktop
      icon64.files += ../../../data/icons/64x64/$${TARGET}.png
+ 
 +    bookmarks.path = $$LIBDIR
 +    bookmarks.files += ../../../data/icons/16x16/staron.png
++
+     service.path = $$DATADIR/dbus-1/services
+     service.files += ../../../data/other/com.comarch.mdictionary.service
  }
  RESOURCES += xslt2.qrc