1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From: Marius Kintel <marius@kintel.net>
Date: Wed, 2 Dec 2015 15:57:19 -0500
Subject: Improved some USE_QOPENGLWIDGET defines
---
src/QGLView.cc | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/QGLView.cc b/src/QGLView.cc
index 024da9f..91d8ca6 100644
--- a/src/QGLView.cc
+++ b/src/QGLView.cc
@@ -51,7 +51,7 @@
#endif
QGLView::QGLView(QWidget *parent) :
-#if QT_VERSION >= 0x050400 && defined(USE_QOPENGLWIDGET)
+#ifdef USE_QOPENGLWIDGET
QOpenGLWidget(parent)
#else
QGLWidget(parent)
@@ -60,7 +60,7 @@ QGLView::QGLView(QWidget *parent) :
init();
}
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(USE_QOPENGLWIDGET)
static bool running_under_wine = false;
#endif
@@ -74,16 +74,15 @@ void QGLView::init()
setMouseTracking(true);
-#if !(QT_VERSION >= 0x050400)
+
+#if defined(_WIN32) && !defined(USE_QOPENGLWIDGET)
// see paintGL() + issue160 + wine FAQ
-#ifdef _WIN32
#include <windows.h>
HMODULE hntdll = GetModuleHandle(L"ntdll.dll");
if (hntdll)
if ( (void *)GetProcAddress(hntdll, "wine_get_version") )
running_under_wine = true;
#endif
-#endif
}
void QGLView::resetView()
@@ -172,7 +171,7 @@ void QGLView::paintGL()
statusLabel->setText(QString::fromStdString(nc.statusText()));
}
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(USE_QOPENGLWIDGET)
if (running_under_wine) swapBuffers();
#endif
}
|
