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

Fix tests to build in a no-widgets configuration

Browse Source 
The qfilesystemmodel.pro was recently moved to the gui tests subfolder,
but it uses widgets inside. Skip it in a no-widgets build.

Amends fb9ec8ad44decba7b2878370f3711b61614f035a

Task-number: QTBUG-86187
Change-Id: I955556ffddad483d4c25602ae126b8c2433091b2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2020-09-15 12:40:06 +02:00
parent 1162b4bfc9
commit 9ce8281417
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/gui/itemmodels/CMakeLists.txt
View File

@ -1,9 +1,9 @@
# Generated from itemmodels.pro. # Generated from itemmodels.pro.
add_subdirectory(qstandarditem) add_subdirectory(qstandarditem)
if(NOT MINGW)
add_subdirectory(qfilesystemmodel)
endif()
if(TARGET Qt::Widgets) if(TARGET Qt::Widgets)
add_subdirectory(qstandarditemmodel) add_subdirectory(qstandarditemmodel)
endif() endif()
if(TARGET Qt::Widgets AND NOT MINGW)
add_subdirectory(qfilesystemmodel)
endif()

5
tests/auto/gui/itemmodels/itemmodels.pro
View File

@ -6,5 +6,8 @@ SUBDIRS= \
mingw: SUBDIRS -= qfilesystemmodel # QTBUG-29403 mingw: SUBDIRS -= qfilesystemmodel # QTBUG-29403
!qtHaveModule(widgets): SUBDIRS -= \ !qtHaveModule(widgets) {
SUBDIRS -= \
qfilesystemmodel \
qstandarditemmodel qstandarditemmodel
}