From 81b4d25b5c29acd58a8135f23fd2ec0460667467 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Mon, 8 Mar 2021 09:49:40 +0100 Subject: [PATCH] Remove unneeded QtOpenGL dependency Qt OpenGL in Qt5 is a deprecated module that is discouraged for new code usage. We have been including this module in our builds despite not relying on its functionality for a long time now - probably an oversight from porting to the newer functions. Time to remove it. IMPORTANT INFORMATION: In Qt6, a lot of functionality that was provided by Qt GUI was moved into the 'new' Qt6 Qt OpenGL module. Thus, even if it makes perfectly sense to remove it for Qt5 builds we will likely have to restore it for Qt6 builds at a later time. --- YACReader/YACReader.pro | 3 --- YACReaderLibrary/YACReaderLibrary.pro | 3 --- common/gl/yacreader_flow_gl.cpp | 1 - 3 files changed, 7 deletions(-) diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 1404b98d..067e78e3 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -69,9 +69,6 @@ macx { } QT += network widgets core multimedia svg -!CONFIG(no_opengl) { - QT += opengl -} #CONFIG += release CONFIG -= flat diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index b17f27ac..c86a5c16 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -70,9 +70,6 @@ macx { #CONFIG += release CONFIG -= flat QT += sql network widgets svg -!CONFIG(no_opengl) { - QT += opengl -} # Input HEADERS += comic_flow.h \ diff --git a/common/gl/yacreader_flow_gl.cpp b/common/gl/yacreader_flow_gl.cpp index ad59daf7..57643c74 100644 --- a/common/gl/yacreader_flow_gl.cpp +++ b/common/gl/yacreader_flow_gl.cpp @@ -1,7 +1,6 @@ #include "yacreader_flow_gl.h" #include -#include #include #include