Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

Conflicts:
	src/mdictionary/mdictionary.pro

diff --cc src/mdictionary/mdictionary.pro
index d049501,9d67737..fd4b0bc
--- 1/src/mdictionary/mdictionary.pro
--- 2/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -76,6 -76,9 +76,14 @@@ RESOURCES += ../../data/gui.qr
  TRANSLATIONS += pl_PL.ts \
                  en_US.ts
  
+ OTHER_FILES += \
 -   qml/WelcomeScreenWidget.qml
++    qml/WelcomeScreenWidget.qml \
++    qml/Button.qml \
++    qml/AboutWidget.qml \
++    qml/SearchBarWidget.qml \
++    qml/IconButton.qml \
++    qml/MyTextLineEdit.qml
+ 
  target.path = $$BIN_DIR
  INSTALLS += target
  
@@@ -145,19 -151,28 +156,32 @@@ unix 
          css_images.files += ../../data/css_desktop/images/key-background.png
      }
  
+     #services
      service.path = $$SHARE_DIR/dbus-1/services
      service.files += ../../data/other/com.comarch.mdictionary.service
+ 
+     #qmls (stub)
+     meego {
+         qmls.path = $$DATA_DIR/qml
+         qmls.files += ./qml/WelcomeScreenWidget.qml
+     }
+     else:maemo5 {
+         qmls.path = $$DATA_DIR/qml
+         qmls.files += ./qml/WelcomeScreenWidget.qml
+     }
+     else {
+         qmls.path = $$DATA_DIR/qml
+         qmls.files += ./qml/WelcomeScreenWidget.qml
++      qmls.files += ./qml/Button.qml 
++      qmls.files += ./qml/AboutWidget.qml
++      qmls.files += ./qml/SearchBarWidget.qml
++      qmls.files += ./qml/IconButton.qml
++      qmls.files += ./qml/MyTextLineEdit.qml
+     }
        
-     INSTALLS += desktop icon64 shared service css css_images
+     INSTALLS += desktop icon64 shared service css css_images qmls
  }
  
  
  check.commands = echo 'No check here'
  QMAKE_EXTRA_TARGETS += check
--
- OTHER_FILES += \
-     qml/Button.qml \
-     qml/AboutWidget.qml \
-     qml/SearchBarWidget.qml \
-     qml/IconButton.qml \
-     qml/MyTextLineEdit.qml