From 4aaf5e2c20c0cf62cf7b83490fe6a76270720a22 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 11 Oct 2013 10:48:57 +0200 Subject: Android: Skip tools built for target architecture Android apps require packaging to be usable, so they need to be built individually, not as part of the subdirs build. The build would fail during make install due to this. Task-number: QTBUG-34023 Change-Id: Id68f5fbdd4eeb6f130d20a0f4b831c6c24639471 Reviewed-by: Paul Olav Tvete --- tools/tools.pro | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/tools.pro b/tools/tools.pro index 168746e052..2dab801be7 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,12 +1,13 @@ TEMPLATE = subdirs -qtHaveModule(quick): SUBDIRS += qmlscene qmlplugindump -qtHaveModule(qmltest): SUBDIRS += qmltestrunner +qtHaveModule(quick): !android|android_app: SUBDIRS += qmlscene qmlplugindump +qtHaveModule(qmltest): !android|android_app: SUBDIRS += qmltestrunner SUBDIRS += \ - qml \ qmlmin \ - qmlprofiler \ - qmlbundle \ - v4 + qmlprofiler +!android|android_app: SUBDIRS += \ + qml \ + qmlbundle \ + v4 qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing qtHaveModule(quick): SUBDIRS += qmlimportscanner -- cgit v1.2.3