diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-14 21:37:35 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-16 11:35:33 +0000 |
| commit | 4f0ee5fb375088b902ead875985ad7d7e8438bb4 (patch) | |
| tree | a23533c57f50e41f7a5c858e24b48ccbcc33c7e0 /tests/auto/tools | |
| parent | fc80bd201c7ee583254ec90eefcb16f550127cd1 (diff) | |
Android: exclude host tools tests for android and ios
Task-number: QTBUG-87025
Task-number: QTBUG-88538
Change-Id: Id691c8463e9bf83c4538dce93300fb4fd5a99849
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/auto/tools/tools.pro | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/auto/tools/CMakeLists.txt b/tests/auto/tools/CMakeLists.txt index d6cc753db7..f1a9ced60e 100644 --- a/tests/auto/tools/CMakeLists.txt +++ b/tests/auto/tools/CMakeLists.txt @@ -1,10 +1,14 @@ # Generated from tools.pro. -add_subdirectory(qmakelib) -add_subdirectory(qmake) -add_subdirectory(moc) -add_subdirectory(rcc) -if(TARGET Qt::Widgets) +# QTBUG-88538 # special case +if(NOT ANDROID AND NOT IOS) + add_subdirectory(qmakelib) + add_subdirectory(qmake) + add_subdirectory(moc) + add_subdirectory(rcc) +endif() +# QTBUG-88538 # special case +if(TARGET Qt::Widgets AND NOT ANDROID AND NOT IOS) add_subdirectory(uic) endif() if(TARGET Qt::DBus) diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro index 7e4dc67b09..c73036aa4a 100644 --- a/tests/auto/tools/tools.pro +++ b/tests/auto/tools/tools.pro @@ -1,5 +1,6 @@ TEMPLATE=subdirs -SUBDIRS=\ +# QTBUG-88538 +!android:!ios: SUBDIRS = \ qmakelib \ qmake \ uic \ |