From: jakub <jakub.jaszczynski@comarch.com>
Date: Fri, 21 Jan 2011 08:58:24 +0000 (+0100)
Subject: Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=f398f7e3985c755407a9172468fe94b903bedb49;hp=-c;p=mdictionary

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

Conflicts:
	src/mdictionary/mdictionary.pro
---

f398f7e3985c755407a9172468fe94b903bedb49
diff --combined src/mdictionary/mdictionary.pro
index 75ebf14,2a80942..5c3be82
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -41,7 -41,7 +41,8 @@@ SOURCES += gui/main.cpp 
      gui/SpinBox.cpp \
      gui/DictTypeModel.cpp \
      gui/DictManagerModel.cpp \
-     gui/HistoryListModel.cpp
++    gui/HistoryListModel.cpp \
+     gui/WordListModel.cpp
  
  HEADERS += gui/MainWindow.h \
      backbone/ConfigGenerator.h \
@@@ -55,7 -55,7 +56,7 @@@
      ../include/CommonDictInterface.h \
      gui/MenuWidget.h \
      gui/MenuTabWidget.h \
--    gui/DictManagerWidget.h \
++
      gui/DictTypeSelectDialog.h \
      ../include/History.h \
      gui/HistoryListDialog.h \
@@@ -75,7 -75,7 +76,8 @@@
      gui/SpinBox.h \
      gui/DictTypeModel.h \
      gui/DictManagerModel.h \
-     gui/HistoryListModel.h
++    gui/HistoryListModel.h \
+     gui/WordListModel.h
  
  RESOURCES += ../../data/gui.qrc
  
@@@ -99,8 -99,7 +101,8 @@@ OTHER_FILES += 
      qml/ScrollBar.qml \
      qml/Checkbox.qml \
      qml/MySpinBox.qml \
 -    qml/SettingsWidget.qml
 +    qml/SettingsWidget.qml \
 +    qml/HistoryListDialog.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
@@@ -222,7 -221,6 +224,7 @@@ unix 
          qmls.files += ./qml/Checkbox.qml
          qmls.files += ./qml/MySpinBox.qml
          qmls.files += ./qml/SettingsWidget.qml
 +        qmls.files += ./qml/HistoryListDialog.qml
      }
  	
      INSTALLS += desktop icon64 shared service css css_images qmls