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 516fe60..8701e4e 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -38,7 +38,8 @@ SOURCES += gui/main.cpp \
     gui/TranslationView.cpp \
     gui/DBusAdapter.cpp \
     gui/NotifyManager.cpp \
-    gui/SpinBox.cpp
+    gui/SpinBox.cpp \
+    gui/DictTypeModel.cpp
 
 HEADERS += gui/MainWindow.h \
     backbone/ConfigGenerator.h \
@@ -69,7 +70,8 @@ HEADERS += gui/MainWindow.h \
     ../include/DictDialog.h \
     gui/DBusAdapter.h \
     gui/NotifyManager.h \
-    gui/SpinBox.h
+    gui/SpinBox.h \
+    gui/DictTypeModel.h
 
 RESOURCES += ../../data/gui.qrc
 
@@ -77,7 +79,17 @@ TRANSLATIONS += pl_PL.ts \
                 en_US.ts
 
 OTHER_FILES += \
-   qml/WelcomeScreenWidget.qml
+    qml/WelcomeScreenWidget.qml \
+    qml/Button.qml \
+    qml/AboutWidget.qml \
+    qml/SearchBarWidget.qml \
+    qml/IconButton.qml \
+    qml/MyTextLineEdit.qml \
+    qml/ProgressBar.qml \
+    qml/ElementsListView.qml \
+    qml/DictTypeSelectDialog.qml \
+    qml/DictManagerWidget.qml \
+    qml/WordListWidget.qml
 
 target.path = $$BIN_DIR
 INSTALLS += target
@@ -123,8 +135,8 @@ unix {
         css_images.files += ../../data/css_meego/images/shadow-white-bg.png
         css_images.files += ../../data/css_meego/images/tab-background.png
         css_images.files += ../../data/css_meego/images/key-background.png
-    css_images.files += ../../data/css_meego/images/shadow-transparent-bg. png
-       css_images.files += ../../data/css_meego/images/splash2.png
+        css_images.files += ../../data/css_meego/images/shadow-transparent-bg. png
+        css_images.files += ../../data/css_meego/images/splash2.png
     }
     else:maemo5 {
         css.path = $$DATA_DIR/css
@@ -167,6 +179,16 @@ unix {
     else {
         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
     }
        
     INSTALLS += desktop icon64 shared service css css_images qmls