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

diff --combined src/mdictionary/mdictionary.pro
index 79ddab6,cc5af0a..d01fcc4
--- 1/src/mdictionary/mdictionary.pro
--- 2/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -39,7 -39,8 +39,8 @@@ SOURCES += gui/main.cpp 
      gui/DBusAdapter.cpp \
      gui/NotifyManager.cpp \
      gui/SpinBox.cpp \
-     gui/DictTypeModel.cpp
+     gui/DictTypeModel.cpp \
+     gui/DictManagerModel.cpp
  
  HEADERS += gui/MainWindow.h \
      backbone/ConfigGenerator.h \
@@@ -71,7 -72,8 +72,8 @@@
      gui/DBusAdapter.h \
      gui/NotifyManager.h \
      gui/SpinBox.h \
-     gui/DictTypeModel.h
+     gui/DictTypeModel.h \
+     gui/DictManagerModel.h
  
  RESOURCES += ../../data/gui.qrc
  
@@@ -90,9 -92,7 +92,9 @@@ OTHER_FILES += 
      qml/DictTypeSelectDialog.qml \
      qml/DictManagerWidget.qml \
      qml/WordListWidget.qml \
 -    qml/TranslationView.qml
 +    qml/TranslationView.qml \
 +    qml/FlickableWebView.qml \
 +    qml/ScrollBar.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
@@@ -193,8 -193,6 +195,8 @@@ unix 
          qmls.files += ./qml/DictManagerWidget.qml
          qmls.files += ./qml/WordListWidget.qml
          qmls.files += ./qml/TranslationView.qml
 +        qmls.files += ./qml/FlickableWebView.qml
 +        qmls.files += ./qml/ScrollBar.qml
      }
        
      INSTALLS += desktop icon64 shared service css css_images qmls