From 5f181e3a54b93f40d0ac483028e3009af41b5672 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 5 Apr 2019 13:56:44 +0300
Subject: [PATCH] Don't use Qt OpenGL module since Q5.4.

--HG--
branch : develop
---
 common.pri                                 | 21 ++++++++++++++++-----
 src/app/tape/tape.pro                      |  7 ++++++-
 src/app/valentina/valentina.pro            |  7 ++++++-
 src/test/CollectionTest/CollectionTest.pro |  7 ++++++-
 src/test/ValentinaTest/ValentinaTest.pro   |  7 ++++++-
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/common.pri b/common.pri
index 6cbe811f0..928af36eb 100644
--- a/common.pri
+++ b/common.pri
@@ -270,8 +270,13 @@ ISYSTEM += \
     -isystem "$$[QT_INSTALL_HEADERS]/QtSvg" \
     -isystem "$$[QT_INSTALL_HEADERS]/QtNetwork" \
     -isystem "$$[QT_INSTALL_HEADERS]/QtTest" \
-    -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent" \
-    -isystem "$$[QT_INSTALL_HEADERS]/QtOpenGL"
+    -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent"
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]/QtOpenGL"
+}
+
 } else {
 ISYSTEM += \
     -isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Headers/" \
@@ -293,9 +298,15 @@ ISYSTEM += \
     -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Headers/" \
     -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Versions/5/Headers/" \
     -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Versions/5/Headers/"
+    -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Versions/5/Headers/"
+
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    ISYSTEM += \
+        -isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Headers/" \
+        -isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Versions/5/Headers/"
+}
 }
 
 # Usefull GCC warnings keys.
diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
index 6fc3003df..850c2cf9f 100644
--- a/src/app/tape/tape.pro
+++ b/src/app/tape/tape.pro
@@ -7,7 +7,12 @@
 # File with common stuff for whole project
 include(../../../common.pri)
 
-QT       += core gui widgets network xml xmlpatterns printsupport svg concurrent opengl
+QT       += core gui widgets network xml xmlpatterns printsupport svg concurrent
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    QT += opengl
+}
 
 # Name of binary file
 TARGET = tape
diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
index e5af3bbcc..cf14e3be9 100644
--- a/src/app/valentina/valentina.pro
+++ b/src/app/valentina/valentina.pro
@@ -11,7 +11,12 @@ include(../../../common.pri)
 
 # Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this
 # library in installer.
-QT       += core gui widgets xml svg printsupport xmlpatterns concurrent opengl
+QT       += core gui widgets xml svg printsupport xmlpatterns concurrent
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    QT += opengl
+}
 
 # Use winextras only for Windows 7+
 win32:greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro
index 7e5399bf2..3d1a6c5dd 100644
--- a/src/test/CollectionTest/CollectionTest.pro
+++ b/src/test/CollectionTest/CollectionTest.pro
@@ -4,7 +4,12 @@
 #
 #-------------------------------------------------
 
-QT       += testlib widgets printsupport concurrent opengl
+QT       += testlib widgets printsupport concurrent
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    QT += opengl
+}
 
 QT       -= gui
 
diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro
index 52f6fe229..a96e2d372 100644
--- a/src/test/ValentinaTest/ValentinaTest.pro
+++ b/src/test/ValentinaTest/ValentinaTest.pro
@@ -4,7 +4,12 @@
 #
 #-------------------------------------------------
 
-QT       += core testlib gui printsupport xml xmlpatterns concurrent opengl
+QT += core testlib gui printsupport xml xmlpatterns concurrent
+
+# Don't use Qt OpenGL module since Q5.4
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+    QT += opengl
+}
 
 TARGET = ValentinaTests