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

Disable some tools and plugins if regularexpression feature is disabled

Browse Source 
There are still more failures, but these are low-hanging fruit.

Pick-to: 6.2
Change-Id: I3d3a1dc9e754bd4865c850cc1549b0b6fd6fa2f8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Mitch Curtis 2021-11-11 15:19:27 +01:00
parent 7d90bee769
commit 0d6438f808
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/sqldrivers/CMakeLists.txt
View File

@ -36,7 +36,7 @@ include(configure.cmake)
qt_feature_module_end(NO_MODULE) qt_feature_module_end(NO_MODULE)
if(QT_FEATURE_sql_psql) if(QT_FEATURE_sql_psql AND QT_FEATURE_regularexpression)
add_subdirectory(psql) add_subdirectory(psql)
endif() endif()

2
src/tools/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if (QT_FEATURE_commandlineparser)
endif() endif()
# Only include the following tools when performing a host build # Only include the following tools when performing a host build
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression)
add_subdirectory(androiddeployqt) add_subdirectory(androiddeployqt)
if(QT_FEATURE_gui AND QT_FEATURE_systemsemaphore) if(QT_FEATURE_gui AND QT_FEATURE_systemsemaphore)
add_subdirectory(androidtestrunner) add_subdirectory(androidtestrunner)