From 636fcc4bb2edbbd0b75fdecfc9c6b40b0c872803 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Jan 2021 17:00:45 +0100 Subject: Remove superfluous OpenGL_GL_PREFERENCE assignment We did set this variable, however after src/gui/configure.cmake was loaded (it is early-loaded in src/CMakeLists.txt), meaning the assignment had no effect. Also, what this assignment tried to achieve is covered by our global CMake policies now. Task-number: QTBUG-89754 Change-Id: Ie7aeee1505d112d799455b2915acbfa7e9a12a64 Reviewed-by: Cristian Adam (cherry picked from commit 36b1e03ecdaac40aaae5fa42ee9a5b3b50991ea3) Reviewed-by: Qt Cherry-pick Bot --- src/gui/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index b2a682781d..802c0a2ecd 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,7 +1,5 @@ # Generated from gui.pro. -set(OpenGL_GL_PREFERENCE GLVND) # special case: - ##################################################################### ## Gui Module: ##################################################################### -- cgit v1.2.3