diff options
| author | Dennis Oberst <dennis.oberst@qt.io> | 2023-08-11 14:04:02 +0200 |
|---|---|---|
| committer | Dennis Oberst <dennis.oberst@qt.io> | 2023-08-22 08:37:36 +0000 |
| commit | 7f8ab80931c49a721a9d001421acd2e41bb6fcdb (patch) | |
| tree | 8d35643c46d6f17f9d70bec9143b4004833ab8b2 | |
| parent | 368391b69f216b800b198e9c6ad99619e8e9fe83 (diff) | |
CMake: Add the Svg package to OPTIONAL_COMPONENTS
It is an optional dependency of the module and some examples and tests
depend on it.
Since this patch enables the Svg package on the CI, a previously
unexecuted test has begun failing on the Android platform. This seems to
be a known issue, thus add this particular test case to the BLACKLIST
file.
Change-Id: I46e00308a81189c80c7d788920908a884d05663d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 4f9687927da504c344a6e1805fe32f0b2d650d8e)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/quickcontrols/qquickiconimage/BLACKLIST | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 005b06db63..e152cde949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(QtDeclarative # special case ) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case -find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServerPrivate LinguistTools) +find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServerPrivate LinguistTools Svg) qt_internal_project_setup() # Set up QT_HOST_PATH as an extra root path to look for the ShaderToolsTools package diff --git a/tests/auto/quickcontrols/qquickiconimage/BLACKLIST b/tests/auto/quickcontrols/qquickiconimage/BLACKLIST index 70c935375d..dcd5b24391 100644 --- a/tests/auto/quickcontrols/qquickiconimage/BLACKLIST +++ b/tests/auto/quickcontrols/qquickiconimage/BLACKLIST @@ -13,3 +13,5 @@ android android [translucentColors] android +[svgSourceBindingSourceSize] +android |