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

[mdictionary] / src / plugins / xdxf / xdxf.pro

diff --git a/src/plugins/xdxf/xdxf.pro b/src/plugins/xdxf/xdxf.pro
index d6b64cf..f91a16a 100644 (file)
--- a/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@ -4,7 +4,17 @@ QT = core \
     gui \
     xml \
     sql \
-    network
+    network\
+    declarative
+
+maemo5 {
+    LIBS += -lbz2 \
+}
+
+!maemo5 {
+    LIBS += -ltar \
+        -lbz2
+}
 
 maemo5:QT += maemo5
 SOURCES += xdxfplugin.cpp \
@@ -14,9 +24,9 @@ SOURCES += xdxfplugin.cpp \
     XdxfDialog.cpp \
     XdxfDictDownloader.cpp \
     XdxfDictSelectDialog.cpp \
-    XdxfDictDownloadProgressDialog.cpp
-
-
+    XdxfDictDownloadProgressDialog.cpp \
+    DictsModel.cpp \
+    HttpDownloader.cpp
 HEADERS += xdxfplugin.h \
     TranslationXdxf.h \
     ../../include/DictDialog.h \
@@ -28,23 +38,44 @@ HEADERS += xdxfplugin.h \
     XdxfDialog.h \
     XdxfDictDownloader.h \
     XdxfDictSelectDialog.h \
-    XdxfDictDownloadProgressDialog.h \ 
-    DownloadDict.h
-       
-RESOURCES += \
-    xdxf.qrc
-
+    XdxfDictDownloadProgressDialog.h \
+    DownloadDict.h \
+    DictsModel.h \
+    DictsProxyModel.h \
+    HttpDownloader.h
+RESOURCES += xdxf.qrc
 TRANSLATIONS += pl_PL.ts \
     en_US.ts
-unix { 
-    INSTALLS += dicts \
-        plugin-icon
+OTHER_FILES += \
+    ../../mdictionary/qml/XdxfDialog.qml
+
+
+unix {
     dicts.path = $$PLUGINS_DIR
     dicts.files += ../../../data/dicts/eng-us.xdxf
     dicts.files += ../../../data/dicts/eng-thai.xdxf
     plugin-icon.path = $$DATA_DIR
     plugin-icon.files += xdxf.png
+
+    meego {
+        qmls.path = $$DATA_DIR/qml
+        qmls.files += ../../mdictionary/qml/XdxfDialog.qml
+    }
+    else:maemo5 {
+        qmls.path = $$DATA_DIR/qml
+        qmls.files += ../../mdictionary/qml/XdxfDialog.qml
+    }
+    else {
+        qmls.path = $$DATA_DIR/qml
+        qmls.files += ../../mdictionary/qml/XdxfDialog.qml
+    }
+
+    INSTALLS += dicts \
+        plugin-icon\
+        qmls
 }
 check.commands = echo \
     'No check here'
 QMAKE_EXTRA_TARGETS += check
+
+