From 4f0ee5fb375088b902ead875985ad7d7e8438bb4 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 14 Nov 2020 21:37:35 +0200 Subject: [PATCH] Android: exclude host tools tests for android and ios Task-number: QTBUG-87025 Task-number: QTBUG-88538 Change-Id: Id691c8463e9bf83c4538dce93300fb4fd5a99849 Reviewed-by: Alexandru Croitor --- tests/auto/tools/CMakeLists.txt | 14 +++++++++----- 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 d6cc753db7a..f1a9ced60ea 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 7e4dc67b093..c73036aa4a0 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 \