From 2c19640089e97dfe819fdf55483d1cb3c92a5cac Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 1 Mar 2019 14:02:19 +0200
Subject: [PATCH] Don't use Qt OpenGL module since Q5.4. (grafted from
 82e62ea2d785e093af68089e509b224f3f4f843f)

--HG--
branch : develop
---
 src/app/valentina/valentina.pro | 6 +++++-
 src/libs/vwidgets/vwidgets.pro  | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
index 52933887b..e5af3bbcc 100644
--- a/src/app/valentina/valentina.pro
+++ b/src/app/valentina/valentina.pro
@@ -297,7 +297,6 @@ win32:*g++* {
         $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
         $$[QT_INSTALL_BINS]/Qt5Core.dll \
         $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
-        $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
         $$[QT_INSTALL_BINS]/Qt5Gui.dll \
         $$[QT_INSTALL_BINS]/Qt5Network.dll \
         $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
@@ -309,6 +308,11 @@ win32:*g++* {
         $$[QT_INSTALL_BINS]/libstdc++-6.dll \
         $$[QT_INSTALL_BINS]/libwinpthread-1.dll
 
+    # Don't use Qt OpenGL module since Q5.4
+    equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+        package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
+    }
+
     # For support Windows 7+
     greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
         package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro
index 431e99ee9..3d98c7f18 100644
--- a/src/libs/vwidgets/vwidgets.pro
+++ b/src/libs/vwidgets/vwidgets.pro
@@ -7,7 +7,12 @@
 # File with common stuff for whole project
 include(../../../common.pri)
 
-QT += widgets printsupport opengl
+QT += widgets printsupport
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    QT += opengl
+}
 
 # Name of the library
 TARGET = vwidgets