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

Fix: build with QTSERIALPORT=false #56953

Merged
merged 2 commits into from
Mar 24, 2024

Conversation

t0b3
Copy link
Contributor

@t0b3 t0b3 commented Mar 24, 2024

Description

  • fixes build error for QTSERIALPORT=false
  • disable uploading of docker image if github.actor != 'qgis' so GH actions in forked repos won't fail for this reason

Backport

  • backport to 3.36 releases

#Fixes #56944

@github-actions github-actions bot added this to the 3.38.0 milestone Mar 24, 2024
@@ -91,21 +91,24 @@ done:

%End

%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
Copy link
Member

Choose a reason for hiding this comment

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

Do we need all the other features?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@m-kuhn hmm, that's a good question - It was already there... just tell me if you feel some of them should be removed in this PR as well 👍

Copy link
Member

Choose a reason for hiding this comment

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

Oh I see, you moved them up

Copy link
Contributor Author

@t0b3 t0b3 Mar 24, 2024

Choose a reason for hiding this comment

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

@m-kuhn sure they were ... just a few lines lower ... and they need to be introduced before %If (<your_feature>) that's why I suggest to shift them all together

Copy link

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 27e8f96)

Copy link
Member

@m-kuhn m-kuhn left a comment

Choose a reason for hiding this comment

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

Lgtm

@@ -91,21 +91,24 @@ done:

%End

%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
Copy link
Member

Choose a reason for hiding this comment

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

Oh I see, you moved them up

@m-kuhn m-kuhn merged commit fdefdf9 into qgis:master Mar 24, 2024
31 checks passed
@t0b3 t0b3 deleted the fix--build-without-qtserialport branch March 24, 2024 20:37
This was referenced Mar 24, 2024
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.

Compile error WITH_SERIALPORT=false
3 participants