diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-10-11 10:48:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 16:01:24 +0200 |
| commit | 4aaf5e2c20c0cf62cf7b83490fe6a76270720a22 (patch) | |
| tree | 525e3d359f4765a6086b2ac20b540cee2e9255de /tools | |
| parent | dfca0ef6ee9c8725bc111dadf1d5addd12f23944 (diff) | |
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 <paul.tvete@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools.pro | 13 |
1 files changed, 7 insertions, 6 deletions
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 |