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

clang-format on src/gui + fix windows builds #59760

Merged
merged 12 commits into from
Dec 6, 2024

Conversation

3nids
Copy link
Member

@3nids 3nids commented Dec 5, 2024

So, using SIP_TYPEHEADER_INCLUDE( xxx.h ) seems to be failing on MingW builds:

  /__w/QGIS/QGIS/src/core/raster/qgsrastershaderfunction.h:36:29: error: 'qgscolorrampshader' has not been declared
     36 |     SIP_TYPEHEADER_INCLUDE( qgscolorrampshader.h );

https://github.com/qgis/QGIS/actions/runs/12181752788/job/33979118401#step:12:866

I don't understand why it was not caught in #59691 (https://github.com/qgis/QGIS/actions/runs/12155138928/job/33896100592)

I also tried SIP_TYPEHEADER_INCLUDE( "xxx.h" ):

error: expected identifier before string constant`

https://github.com/qgis/QGIS/actions/runs/12182336466/job/33981099900#step:12:867

I don't see any other option than putting comment in front for now.

@github-actions github-actions bot added this to the 3.42.0 milestone Dec 5, 2024
@3nids 3nids closed this Dec 5, 2024
@3nids 3nids reopened this Dec 5, 2024
@3nids 3nids closed this Dec 5, 2024
@3nids 3nids reopened this Dec 5, 2024
@3nids 3nids changed the title clang-format on src/gui clang-format on src/gui + fix windows builds Dec 5, 2024
Copy link

github-actions bot commented Dec 5, 2024

🪟 Windows Qt6 builds

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

🪟 Windows builds

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

@nyalldawson nyalldawson merged commit 5bfbccf into qgis:master Dec 6, 2024
29 of 30 checks passed
@3nids 3nids deleted the clang-format-gui branch December 7, 2024 10:56
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.

2 participants