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

[mdictionary] / mdictionary.pro

diff --git a/mdictionary.pro b/mdictionary.pro
index f501bf2..477639b 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,14 +1,17 @@
 TEMPLATE = subdirs
-SUBDIRS = src tests
+SUBDIRS = src
 CONFIG += ordered
 include (mdictionary.pri)
 
 
 check.CONFIG += recursive
-check.recurse = src tests
-check.depends = install
+check.recurse = src
 QMAKE_EXTRA_TARGETS += check
 
+
+include (doc/doc.pri)
+QMAKE_EXTRA_TARGETS += doc
+
 message("Enabled sources: "$$ENABLED_SRC)
 message("Enabled plugins: "$$ENABLED_PLUGINS)
 
@@ -17,15 +20,5 @@ message("Binary directory: "$$BIN_DIR)
 message("Data directory: "$$DATA_DIR)
 message("Plugins directory: "$$PLUGINS_DIR)
 message("Documentation directory: "$$DOCS_DIR)
+#message("Qml directory: "$$QMLS_DIR)
 
-
-if(coverage) {
-        coverage-report.CONFIG = recursive
-        coverage-report.recurse = src
-        QMAKE_EXTRA_TARGETS += coverage-report
-        message('******************************************************************' )
-        message('* Remember to disable CCACHE in scratchbox to make Code Coverage' )
-        message('* report!' )
-        message('* use command: export SBOX_USE_CCACHE="no"' )
-        message('******************************************************************' )
-}