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

[mdictionary] / mdictionary.pro

diff --git a/mdictionary.pro b/mdictionary.pro
index 1f61f8a..477639b 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,23 +1,24 @@
-QMAKEVERSION = $$[QMAKE_VERSION]
-ISQT4 = $$find(QMAKEVERSION, ^[2-9])
-isEmpty( ISQT4 ) {
-error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
-}
+TEMPLATE = subdirs
+SUBDIRS = src
+CONFIG += ordered
+include (mdictionary.pri)
 
-MDICT_BINDIR = $$[MDICT_BINDIR]
 
-isEmpty(MDICT_BINDIR) {
-       message("empty")
-}
-message($$MDICT_BINDIR)
+check.CONFIG += recursive
+check.recurse = src
+QMAKE_EXTRA_TARGETS += check
 
-TEMPLATE = subdirs
-SUBDIRS  = trunk
-#SUBDIRS += trunk/src/plugins/xdxf/src/
 
-check.target = check
-check.CONFIG = recursive
-check.recurse = trunk
-QMAKE_EXTRA_TARGETS += check
+include (doc/doc.pri)
+QMAKE_EXTRA_TARGETS += doc
+
+message("Enabled sources: "$$ENABLED_SRC)
+message("Enabled plugins: "$$ENABLED_PLUGINS)
 
+message("Install prefix: "$$INSTALL_PREFIX)
+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)