Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: upgrade to Fedora 41 #59595

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

ci: upgrade to Fedora 41 #59595

wants to merge 3 commits into from

Conversation

t0b3
Copy link
Contributor

@t0b3 t0b3 commented Nov 26, 2024

ci: upgrade to Fedora 41

clang v18 warns about ...
src/core/painting/qgsmaskpaintdevice.h:36:5: note: 'QgsMaskPaintEngine' has been explicitly marked deprecated here
Q_DECL_DEPRECATED QgsMaskPaintEngine( bool usePathStroker = false );
... while still being used in
src/core/painting/qgsmaskpaintdevice.cpp:65:23: note: in instantiation of function template specialization 'std::make_unique<QgsMaskPaintEngine, bool &>' requested here
mPaintEngine = std::make_unique<QgsMaskPaintEngine>( usePathStroker );
@github-actions github-actions bot added this to the 3.42.0 milestone Nov 26, 2024
@t0b3 t0b3 marked this pull request as draft November 26, 2024 06:37
Copy link

github-actions bot commented Nov 26, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit a24543e)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit a24543e)

@@ -2196,6 +2196,11 @@ else()
endif()
endif()

# Workaround CLANG deprecation warning
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set_source_files_properties(painting/qgsmaskpaintdevice.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strange... What are those warnings? Can we not fix them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feel free to step in... https://cdash.orfeo-toolbox.org/viewBuildError.php?type=1&buildid=27379
I didn't succeed with the Q_NOWARN_DEPRECATED_PUSH macro, but your experience may help 👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try to surround reference to QgsMaskPaintEngine with Q_NOWARN_DEPRECATED_PUSH and Q_NOWARN_DEPRECATED_POP, starting maybe with the declaration on line 89 of qgsmaskpaintdevice.h

Maybe we also should deprecate the whole classes Engine & Device.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I already tried - it didn't change neither to include the whole two deprecated classes, neither even in combination with Q_NOWARN_DEPRECATED_PUSH/POPping the calls in the qgsmaskpaintdevice.cpp :-( - that's why I turned to this solution which works after all...

Copy link

Tests failed for Qt 6

One or more tests failed using the build from commit a24543e

composerlabel_renderhtml (renderAsHtml)

composerlabel_renderhtml

Test failed at renderAsHtml at tests/src/core/testqgslayoutlabel.cpp:314

Rendered image did not match tests/testdata/control_images/composer_label/expected_composerlabel_renderhtml/expected_composerlabel_renderhtml.png (found 6342 pixels different)

composerlabel_renderhtmllineheight (renderAsHtmlLineHeight)

composerlabel_renderhtmllineheight

Test failed at renderAsHtmlLineHeight at tests/src/core/testqgslayoutlabel.cpp:342

Rendered image did not match tests/testdata/control_images/composer_label/expected_composerlabel_renderhtmllineheight/expected_composerlabel_renderhtmllineheight.png (found 30195 pixels different)

picture_svg_fixed_size

picture_svg_fixed_size

Test failed at testRenderSvgFixedSize at tests/src/python/test_qgsannotationpictureitem.py:807

Rendered image did not match tests/testdata/control_images/annotation_layer/expected_picture_svg_fixed_size/expected_picture_svg_fixed_size.png (found 1652 pixels different)

picture_svg_locked_aspect

picture_svg_locked_aspect

Test failed at testRenderSvgLockedAspect at tests/src/python/test_qgsannotationpictureitem.py:619

Rendered image did not match tests/testdata/control_images/annotation_layer/expected_picture_svg_locked_aspect/expected_picture_svg_locked_aspect.png (found 775 pixels different)

picture_svg_unlocked_aspect

picture_svg_unlocked_aspect

Test failed at testRenderSvgUnlockedAspect at tests/src/python/test_qgsannotationpictureitem.py:646

Rendered image did not match tests/testdata/control_images/annotation_layer/expected_picture_svg_unlocked_aspect/expected_picture_svg_unlocked_aspect.png (found 3748 pixels different)

Remote SVG

Remote SVG

Test failed at testRemoteSVG at tests/src/python/test_qgssvgcache.py:94

Rendered image did not match tests/testdata/control_images/svg_cache/expected_remote_svg/expected_remote_svg.png (found 2045 pixels different)

Remote SVG

Remote SVG

Test failed at testRemoteSVGBlocking at tests/src/python/test_qgssvgcache.py:223

Rendered image did not match tests/testdata/control_images/svg_cache/expected_remote_svg/expected_remote_svg.png (found 2045 pixels different)

Remote SVG as Text

Remote SVG as Text

Test failed at testRemoteSvgAsText at tests/src/python/test_qgssvgcache.py:131

Failed because rendered image and expected image are different dimensions (100x89 v2 100x110)

Remote SVG bad MIME type

Remote SVG bad MIME type

Test failed at testRemoteSvgBadMime at tests/src/python/test_qgssvgcache.py:166

Failed because rendered image and expected image are different dimensions (100x89 v2 100x100)

The full test report (included comparison of rendered vs expected images) can be found here.

Further documentation on the QGIS test infrastructure can be found in the Developer's Guide.

@nyalldawson
Copy link
Collaborator

nyalldawson commented Nov 26, 2024

@t0b3
I've previously looked into this. There's regressions in qt library itself relating to svg rendering, and completely broken 3d views on newer qt6 releases (see #57640)

Until these upstream issues are fixed in qt we're stuck with the older release...

@nyalldawson
Copy link
Collaborator

@t0b3

#59619 fixes two of the failing tests, #59620 fixes another two

@troopa81 Can you take a look at the failing project style settings test here? That's relating to the CMYK work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants