Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
65a8dbfe
Commit
65a8dbfe
authored
May 17, 2017
by
Martin Schultz
Browse files
compatibility fixes for QOpenGLWidgets on Qt Version 5.4 and below
parent
7dd634fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
common/OFGLWidget.hh
View file @
65a8dbfe
...
...
@@ -52,7 +52,7 @@
#include
<QtGlobal>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4,
0
))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4,
4
))
#include
<QOpenGLWidget>
#include
<QSurfaceFormat>
...
...
widgets/glWidget/QtBaseViewer.cc
View file @
65a8dbfe
...
...
@@ -514,7 +514,7 @@ glViewer::copyToImage( QImage& _image,
// makeCurrent();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4,
0
))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4,
4
))
_image
=
glWidget_
->
grabFramebuffer
()
#else
_image
=
glWidget_
->
grabFrameBuffer
(
true
)
...
...
widgets/glWidget/QtBaseViewer_qt.cc
View file @
65a8dbfe
...
...
@@ -65,7 +65,7 @@
#include
<OpenFlipper/common/GlobalOptions.hh>
#if (QT_VERSION >= QT_VERSION_CHECK(5,4,
0
))
#if (QT_VERSION >= QT_VERSION_CHECK(5,4,
4
))
#include
<QOpenGLContext>
#endif
...
...
@@ -80,7 +80,7 @@
void
glViewer
::
swapBuffers
()
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4,
0
))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4,
4
))
glWidget_
->
context
()
->
swapBuffers
(
glWidget_
->
context
()
->
surface
());
#else
glWidget_
->
swapBuffers
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment