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

Conflicts:
	src/mdictionary/mdictionary.pro

diff --cc src/mdictionary/mdictionary.pro
index c31eed0,5101211..8701e4e
--- 1/src/mdictionary/mdictionary.pro
--- 2/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -83,7 -85,10 +85,11 @@@ OTHER_FILES += 
      qml/SearchBarWidget.qml \
      qml/IconButton.qml \
      qml/MyTextLineEdit.qml \
-     qml/ProgressBar.qml
++    qml/ProgressBar.qml \
+     qml/ElementsListView.qml \
+     qml/DictTypeSelectDialog.qml \
+     qml/DictManagerWidget.qml \
+     qml/WordListWidget.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
@@@ -178,7 -183,10 +184,11 @@@ unix 
        qmls.files += ./qml/SearchBarWidget.qml
        qmls.files += ./qml/IconButton.qml
        qmls.files += ./qml/MyTextLineEdit.qml
 +        qmls.files += ./qml/ProgressBar.qml
+         qmls.files += ./qml/ElementsListView.qml
+         qmls.files += ./qml/DictTypeSelectDialog.qml
+         qmls.files += ./qml/DictManagerWidget.qml
+         qmls.files += ./qml/WordListWidget.qml
      }
        
      INSTALLS += desktop icon64 shared service css css_images qmls