Skip to content

Fix compilation on Qt configured for OpenGL ES2#2970

Merged
gzotti merged 1 commit into
Stellarium:masterfrom
10110111:fix-compilation-on-gles2
Jan 9, 2023
Merged

Fix compilation on Qt configured for OpenGL ES2#2970
gzotti merged 1 commit into
Stellarium:masterfrom
10110111:fix-compilation-on-gles2

Conversation

@10110111
Copy link
Copy Markdown
Contributor

@10110111 10110111 commented Jan 5, 2023

Due to QTBUG-83467 the QT_OPENGL_ES_2 define is no longer present since Qt 6.0. Instead, one should use QT_CONFIG(opengles2). This patch does this.

Fixes #2753

I have checked this on Qt 6 in desktop OpenGL and OpenGL ES 2 modes, and on Qt 5 desktop GL.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jan 5, 2023

Great PR! Please pay attention to the following items before merging:

Files matching src/**/*.cpp:

  • Are possibly unused includes removed?

This is an automatically generated QA checklist based on modified files.

@alex-w alex-w added this to the 23.1 milestone Jan 7, 2023
@alex-w alex-w removed their request for review January 7, 2023 18:53
Copy link
Copy Markdown
Member

@gzotti gzotti left a comment

Choose a reason for hiding this comment

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

Works on Win/ANGLE even with Qt5.9.9. Thank you!

@gzotti gzotti merged commit 0f96d60 into Stellarium:master Jan 9, 2023
@10110111 10110111 deleted the fix-compilation-on-gles2 branch February 3, 2023 19:33
@github-actions
Copy link
Copy Markdown

Hello @10110111!

The fix has been merged into source code and you may test it via building Stellarium from source code or wait the weekly development snapshot...

@alex-w alex-w added state: published The fix has been published for testing in weekly binary package and removed state: fixed labels Mar 13, 2023
@github-actions
Copy link
Copy Markdown

Hello @10110111!

Please check the fresh version (development snapshot) of Stellarium:
https://github.com/Stellarium/stellarium-data/releases/tag/weekly-snapshot

@alex-w alex-w removed the state: published The fix has been published for testing in weekly binary package label Mar 27, 2023
@github-actions
Copy link
Copy Markdown

Hello @10110111!

Please check the latest stable version of Stellarium:
https://github.com/Stellarium/stellarium/releases/latest

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.

Stellarium 1.0 fails to build with openGL ES and Qt6

3 participants