1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: exclude host tools tests for android and ios

Browse Source 
Task-number: QTBUG-87025
Task-number: QTBUG-88538
Change-Id: Id691c8463e9bf83c4538dce93300fb4fd5a99849
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Assam Boudjelthia 2020-11-14 21:37:35 +02:00
parent fc80bd201c
commit 4f0ee5fb37
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/tools/CMakeLists.txt
View File

@ -1,10 +1,14 @@
# Generated from tools.pro. # Generated from tools.pro.
add_subdirectory(qmakelib) # QTBUG-88538 # special case
add_subdirectory(qmake) if(NOT ANDROID AND NOT IOS)
add_subdirectory(moc) add_subdirectory(qmakelib)
add_subdirectory(rcc) add_subdirectory(qmake)
if(TARGET Qt::Widgets) add_subdirectory(moc)
add_subdirectory(rcc)
endif()
# QTBUG-88538 # special case
if(TARGET Qt::Widgets AND NOT ANDROID AND NOT IOS)
add_subdirectory(uic) add_subdirectory(uic)
endif() endif()
if(TARGET Qt::DBus) if(TARGET Qt::DBus)

3
tests/auto/tools/tools.pro
View File

@ -1,5 +1,6 @@
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS=\ # QTBUG-88538
!android:!ios: SUBDIRS = \
qmakelib \ qmakelib \
qmake \ qmake \
uic \ uic \