Merge master into gui

[mdictionary] / mdictionary.pro

diff --git a/mdictionary.pro b/mdictionary.pro
index 52c41fd..912067e 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -4,5 +4,21 @@ isEmpty( ISQT4 ) {
 error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
 }
 
+QT += sql
 TEMPLATE = subdirs
-SUBDIRS  = trunk/src/base/
+SUBDIRS  = trunk
+
+BINDIR = $$PREFIX/bin
+LIBDIR = $$PREFIX/lib/$${MDICT_APPNAME}
+DATADIR =$$PREFIX/share
+
+check.target = check
+check.CONFIG = recursive
+check.recurse = trunk
+
+rename_plugins.command = scripts/rename-plugins $$LIBDIR
+rename_plugins.path = $$LIBDIR
+
+
+QMAKE_EXTRA_TARGETS += check
+