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

Conflicts:
	src/mdictionary/mdictionary.pro

diff --combined src/mdictionary/mdictionary.pro
index ce84a73,d2b6f46..b790af9
--- 1/src/mdictionary/mdictionary.pro
--- 2/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -95,7 -95,7 +95,8 @@@ OTHER_FILES += 
      qml/TranslationView.qml \
      qml/FlickableWebView.qml \
      qml/ScrollBar.qml \
 +    qml/SpinBox.qml
+     qml/Checkbox.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
@@@ -198,6 -198,7 +199,7 @@@ unix 
          qmls.files += ./qml/TranslationView.qml
          qmls.files += ./qml/FlickableWebView.qml
          qmls.files += ./qml/ScrollBar.qml
+         qmls.files += ./qml/Checkbox.qml
      }
        
      INSTALLS += desktop icon64 shared service css css_images qmls