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
 }