From 49d82ab5287fa5be8681a9d03ceca78801a7ff8e Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 21 Jan 2025 23:49:42 +0200 Subject: [PATCH] fix build Signed-off-by: Trial97 --- CMakeLists.txt | 3 +-- launcher/CMakeLists.txt | 1 - launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d59f83ad..0fa59146a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,11 +314,10 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 5) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNICODE -D_UNICODE") elseif(Launcher_QT_VERSION_MAJOR EQUAL 6) set(QT_VERSION_MAJOR 6) - find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth OpenGL OpenGLWidgets) + find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth OpenGL) find_package(Qt6 COMPONENTS DBus) list(APPEND Launcher_QT_DBUS Qt6::DBus) list(APPEND Launcher_QT_LIBS Qt6::Core5Compat) - list(APPEND Launcher_QT_OpenGL Qt6::OpenGLWidgets) if(NOT Launcher_FORCE_BUNDLED_LIBS) find_package(QuaZip-Qt6 1.3 QUIET) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index cee30e47d..d6ed1c9e1 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -1305,7 +1305,6 @@ target_link_libraries(Launcher_logic Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::NetworkAuth Qt${QT_VERSION_MAJOR}::OpenGL - ${Launcher_QT_OpenGL} ${Launcher_QT_DBUS} ${Launcher_QT_LIBS} ) diff --git a/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp b/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp index 9fbbcee9f..c00d33720 100644 --- a/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp +++ b/launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "ui/dialogs/skins/draw/SkinOpenGLWidget.h" +#include "ui/dialogs/skins/draw/SkinOpenGLWindow.h" #include #include