Remove dependency on Qt5OpenGL #160
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
added 4 commits
December 23, 2016 03:13
Only Qt 4 code references those files (QMutex and QWaitCondition are not OpenGL files, but still they're only useful in Qt 4 code).
The OpenGL-related code needed by qimage was moved to Qt5Gui, which allows to safely remove the dependency on Qt 5 builds. Build tested on FreeBSD.
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.
The OpenGL-related code needed by
qimagewas moved to Qt5Gui, which allows to safely remove the dependency on Qt 5 builds.Tests run on FreeBSD: there was no link to libQt5OpenGL.so, the includes belong to Qt5Gui, and the build succeeds without Qt5OpenGL installed and with
USE_QT_OPENGLdefined.