Merge branch 'qml'

[mdictionary] / mdictionary.pro

diff --git a/mdictionary.pro b/mdictionary.pro
index 52c41fd..b30dbc5 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,8 +1,25 @@
-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  = trunk/src/base/
+SUBDIRS = src
+CONFIG += ordered
+include (mdictionary.pri)
+
+
+check.CONFIG += recursive
+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)
+
+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)
+