From cda2b33cc6273c57d19a709dde84523bbe3fa2e9 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 17 May 2016 11:00:48 +0200 Subject: [PATCH] Changed: Don't need to use QXcbGlxIntegrationPlugin --- code/ryzom/tools/client/ryzom_installer/CMakeLists.txt | 2 +- code/ryzom/tools/client/ryzom_installer/src/main.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt index 216347e43..4471628e0 100644 --- a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt +++ b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt @@ -42,7 +42,7 @@ ADD_EXECUTABLE(ryzom_installer_qt WIN32 ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIEN NL_DEFAULT_PROPS(ryzom_installer_qt "Ryzom, Tools: Ryzom Installer" ) NL_ADD_RUNTIME_FLAGS(ryzom_installer_qt) NL_ADD_LIB_SUFFIX(ryzom_installer_qt) -TARGET_LINK_LIBRARIES(ryzom_installer_qt nelmisc ryzom_sevenzip ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY}) +TARGET_LINK_LIBRARIES(ryzom_installer_qt nelmisc ryzom_sevenzip ${QT_LIBRARIES}) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_installer_qt ${CMAKE_CURRENT_SOURCE_DIR}/src/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/src/stdpch.cpp) diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index fe837335c..580defe49 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -37,7 +37,6 @@ Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) #elif defined(Q_OS_UNIX) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) - Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin) #endif Q_IMPORT_PLUGIN(QICOPlugin)