Include <QtGui/qtgui-config.h> to fix flatpak builds #12804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@djantti can you confirm this fixes the build error for you? Than let's merge this small regression fix to 2.4. |
|
@Be-ing has confirmed this fixes the flatpack buil error. |
Be-ing
reviewed
Feb 13, 2024
| @@ -1,5 +1,7 @@ | |||
| #pragma once | |||
|
|
|||
| #include <QtGui/qtguiglobal.h> // for QT_NO_OPENGL and QT_OPENGL_ES_2 | |||
There was a problem hiding this comment.
Suggested change
| #include <QtGui/qtguiglobal.h> // for QT_NO_OPENGL and QT_OPENGL_ES_2 | |
| // This is where QT_OPENGL_ES_2 may be defined. | |
| #include <QtGui/qtgui-config.h> |
This more directly gets at what is needed here. I have confirmed it still builds an aarch64 Flatpak.
|
Excellent work! This fixes AArch64 flatpak build for me too. |
daschuer
changed the title
|
Done |
Be-ing
approved these changes
Feb 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This aims to fix #12802