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

[mdictionary] / src / mdictionary / mdictionary.pro

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 79ddab6..2a80942 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -39,7 +39,9 @@ SOURCES += gui/main.cpp \
     gui/DBusAdapter.cpp \
     gui/NotifyManager.cpp \
     gui/SpinBox.cpp \
-    gui/DictTypeModel.cpp
+    gui/DictTypeModel.cpp \
+    gui/DictManagerModel.cpp \
+    gui/WordListModel.cpp
 
 HEADERS += gui/MainWindow.h \
     backbone/ConfigGenerator.h \
@@ -71,7 +73,9 @@ HEADERS += gui/MainWindow.h \
     gui/DBusAdapter.h \
     gui/NotifyManager.h \
     gui/SpinBox.h \
-    gui/DictTypeModel.h
+    gui/DictTypeModel.h \
+    gui/DictManagerModel.h \
+    gui/WordListModel.h
 
 RESOURCES += ../../data/gui.qrc
 
@@ -92,7 +96,10 @@ OTHER_FILES += \
     qml/WordListWidget.qml \
     qml/TranslationView.qml \
     qml/FlickableWebView.qml \
-    qml/ScrollBar.qml
+    qml/ScrollBar.qml \
+    qml/Checkbox.qml \
+    qml/MySpinBox.qml \
+    qml/SettingsWidget.qml
 
 target.path = $$BIN_DIR
 INSTALLS += target
@@ -174,6 +181,22 @@ unix {
     meego {
         qmls.path = $$DATA_DIR/qml
         qmls.files += ./qml/WelcomeScreenWidget.qml
+        qmls.files += ./qml/Button.qml
+        qmls.files += ./qml/AboutWidget.qml
+        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
+        qmls.files += ./qml/TranslationView.qml
+        qmls.files += ./qml/FlickableWebView.qml
+        qmls.files += ./qml/ScrollBar.qml
+        qmls.files += ./qml/Checkbox.qml
+        qmls.files += ./qml/MySpinBox.qml
+        qmls.files += ./qml/SettingsWidget.qml
     }
     else:maemo5 {
         qmls.path = $$DATA_DIR/qml
@@ -195,6 +218,9 @@ unix {
         qmls.files += ./qml/TranslationView.qml
         qmls.files += ./qml/FlickableWebView.qml
         qmls.files += ./qml/ScrollBar.qml
+        qmls.files += ./qml/Checkbox.qml
+        qmls.files += ./qml/MySpinBox.qml
+        qmls.files += ./qml/SettingsWidget.qml
     }
        
     INSTALLS += desktop icon64 shared service css css_images qmls