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

CMake: doctools: Avoid blocking integrations due to version mismatch

Browse Source 
It can happen that qt repo version bumps are direct pushed, and not
merged in DAG-dependency order. This can cause a mismatch between the
qttools package version and any of its dependencies, which would block
integrations. To avoid this, we disable the warning about incompatible
package versions when building the doc tools. The version check in
that case doesn't make sense, so it's safe to do.

Amends f7f02c791bcbee44597f1fe24570ebdf352ec648

Pick-to: 6.8 6.9
Task-number: QTBUG-128730
Change-Id: I6180ecb09c6a3dee415ae73c11549ee0f709f240
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
Alexandru Croitor 2025-02-11 12:07:49 +01:00
parent 9dfd8410b0
commit a8f55f4729
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtBuildStaticDocToolsScript.cmake
View File

@ -178,6 +178,10 @@ function(qt_internal_configure_qt)
-skip qtactiveqt,qtimageformats,qtlanguageserver,qtsvg -skip qtactiveqt,qtimageformats,qtlanguageserver,qtsvg
-- --
-DWARNINGS_ARE_ERRORS=OFF -DWARNINGS_ARE_ERRORS=OFF
# When 6.x.y version bumps are not merged in DAG-dependency order, this avoids
# blocking integrations due to mismatch of qtools package version and any of its
# dependencies.
-DQT_NO_PACKAGE_VERSION_INCOMPATIBLE_WARNING=ON
--log-level STATUS --log-level STATUS
--fresh --fresh
-GNinja -GNinja