summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-10-11 16:17:00 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-10-11 16:17:00 +0200
commit6d1e5b38dd64143e391203f966208a207dba099f (patch)
treec1e09e090bfb25d71a073fb198607e38e4d57df1
parent9c1470888d8fa1dc3220ea411b8429bf8e9df688 (diff)
parent1fd8af1c9e6bca1180f2193aa26d1d01df817395 (diff)
downloadqtxmlpatterns-6d1e5b38dd64143e391203f966208a207dba099f.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Icd0bc0b31f6c925850d6773ec1000afc9a702d36
-rw-r--r--tools/tools.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index c2f1352..121bed8 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS += xmlpatterns xmlpatternsvalidator
+!android|android_app: SUBDIRS += xmlpatterns xmlpatternsvalidator