From: jakub <jakub.jaszczynski@comarch.com>
Date: Fri, 17 Dec 2010 15:43:17 +0000 (+0100)
Subject: Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
X-Git-Url: https://vcs.maemo.org/git/?p=mdictionary;a=commitdiff_plain;h=2e061e2df0f372f91a25be1958abe7b0a72b2f69

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

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

2e061e2df0f372f91a25be1958abe7b0a72b2f69
diff --cc src/mdictionary/mdictionary.pro
index c31eed0,5101211..8701e4e
--- a/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