summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-11-23 12:15:14 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-11-23 13:32:18 +0000
commitde6acd090c4e32717620863532dca4cd10214ac7 (patch)
treec8b16b0d1b303eda934ebc5164a44729d0cfa4e1
parent03cbe371dbd8b5eb51986d27d312813d91a8d380 (diff)
downloadqtconnectivity-de6acd090c4e32717620863532dca4cd10214ac7.tar.gz
Android: Build .jar files
The build of the .jar files depends on the bluetooth and nfc modules already being built, so we need to make sure the subdirs are visited in the order specified. Change-Id: I52617babd31608be5a51c069f74de30a9d2b6a15 Task-number: QTBUG-49367 Task-number: QTBUG-49512 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/src.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro
index c5585757..97b32522 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,7 +1,10 @@
TEMPLATE = subdirs
SUBDIRS += bluetooth nfc
-android: SUBDIRS += android
+android {
+ SUBDIRS += android
+ android.depends += bluetooth nfc
+}
contains(QT_CONFIG, private_tests) {
bluetooth_doc_snippets.subdir = bluetooth/doc/snippets