From: jakub <jakub.jaszczynski@comarch.com>
Date: Thu, 18 Nov 2010 15:32:36 +0000 (+0100)
Subject: Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
X-Git-Url: http://vcs.maemo.org/git/?p=mdictionary;a=commitdiff_plain;h=00c4970f59cd301a63e58a470619b9ad5ab075f2

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

00c4970f59cd301a63e58a470619b9ad5ab075f2
diff --cc src/plugins/xdxf/XdxfDictDownloader.cpp
index 1542e32,887fdf5..1b65408
--- a/src/plugins/xdxf/XdxfDictDownloader.cpp
+++ b/src/plugins/xdxf/XdxfDictDownloader.cpp
@@@ -27,8 -28,12 +27,10 @@@
  #include "XdxfDictDownloadProgressDialog.h"
  #include <QDebug>
  #include <QProcess>
 -
 -
  #include <bzlib.h>
+ #ifndef Q_WS_MAEMO_5
  #include <libtar.h>
+ #endif
  #include <stdio.h>
  #include <fcntl.h>