diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2025-08-15 19:03:48 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2025-08-21 16:26:00 +0200 |
| commit | 253a7f95bca62760a6beb0acb4eb9966ebbd113e (patch) | |
| tree | 85b663e50e16cfdf584f805886eb2c7d54bc0c73 /src/widgets/doc/snippets | |
| parent | 2ce6fd48e0219615d16ff2f93f85462c67848171 (diff) | |
CMake: Don't use private CMake API in doc snippets
Private CMake API like qt_internal_extend_target should not be used in
public doc snippets. While most of the CMakeLists.txt doc snippets
might not appear in the documentation right now, they might in the
future (just like the CMake API doc snippets).
In addition, using private CMake API for doc snippets targets causes
issues with SBOM generation, because the original targets are not
created with private API (e.g. qt_internal_add_module vs
qt_add_library), and thus important sbom meta information is missing,
causing errors at cmake configure time when sbom generation is
enabled.
Pick-to: 6.8 6.9 6.10
Change-Id: I2ef80f617ba8b745520408d22dd2e6be5ee4c5e0
Reviewed-by: Oleksii Zbykovskyi <Oleksii.Zbykovskyi@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/widgets/doc/snippets')
| -rw-r--r-- | src/widgets/doc/snippets/CMakeLists.txt | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/src/widgets/doc/snippets/CMakeLists.txt b/src/widgets/doc/snippets/CMakeLists.txt index 8c6e6dda6e6..505363aef3f 100644 --- a/src/widgets/doc/snippets/CMakeLists.txt +++ b/src/widgets/doc/snippets/CMakeLists.txt @@ -12,6 +12,7 @@ add_library(widgets_snippets OBJECT qlistview-dnd/mainwindow.cpp qlistview-dnd/model.cpp qlistwidget-dnd/mainwindow.cpp + qrhiwidget/rhiwidgetintro.cpp qsortfilterproxymodel/main.cpp qsplashscreen/main.cpp qstackedlayout/main.cpp @@ -43,50 +44,51 @@ add_library(widgets_snippets OBJECT target_link_libraries(widgets_snippets PRIVATE Qt::Core Qt::Gui + Qt::GuiPrivate Qt::Widgets ) -qt_internal_extend_target(widgets_snippets - LIBRARIES - Qt::GuiPrivate - SOURCES - qrhiwidget/rhiwidgetintro.cpp -) - -qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_filedialog - SOURCES +if(QT_FEATURE_filedialog) + target_sources(widgets_snippets PRIVATE filedialogurls/filedialogurls.cpp -) + ) +endif() -qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_graphicsview - SOURCES +if(QT_FEATURE_graphicsview) + target_sources(widgets_snippets PRIVATE graphicssceneadditem/graphicssceneadditemsnippet.cpp graphicsview/graphicsview_snippet.cpp -) + ) +endif() -qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_opengl AND QT_FEATURE_printsupport - LIBRARIES +if(QT_FEATURE_opengl AND QT_FEATURE_printsupport) + target_link_libraries(widgets_snippets PRIVATE Qt::OpenGL Qt::OpenGLWidgets Qt::PrintSupport - SOURCES + ) + target_sources(widgets_snippets PRIVATE graphicsview/graphicsview.cpp -) + ) +endif() -qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_mdiarea - SOURCES +if(QT_FEATURE_mdiarea) + target_sources(widgets_snippets PRIVATE mdiarea/mdiareasnippets.cpp -) + ) +endif() -qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_scrollarea - SOURCES +if(QT_FEATURE_scrollarea) + target_sources(widgets_snippets PRIVATE myscrollarea/myscrollarea.cpp -) + ) +endif() -qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_spinbox AND QT_FEATURE_itemviews - SOURCES +if(QT_FEATURE_spinbox AND QT_FEATURE_itemviews) + target_sources(widgets_snippets PRIVATE qitemdelegate/spinbox-delegate.cpp -) + ) +endif() set_target_properties(widgets_snippets PROPERTIES COMPILE_OPTIONS "-w") |