Commit 1cad6693 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Exclude X11Extras in qt6 for the moment

parent a5836f1d
Pipeline #138868 passed with stage
in 1 minute and 48 seconds
......@@ -133,8 +133,11 @@ set_package_properties(KF5KDcraw PROPERTIES URL "https://phabricator.kde.org/sou
find_package(X11)
if(X11_FOUND)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
set(HAVE_X11 1)
if (QT_MAJOR_VERSION STREQUAL "5")
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
endif()
# we need to add qt6 lib when we found x11
set(HAVE_X11 1)
endif()
configure_file(config-gwenview.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gwenview.h)
......
......@@ -269,7 +269,12 @@ if (KF5KDcraw_FOUND)
endif()
if (HAVE_X11)
target_link_libraries(gwenviewlib Qt::X11Extras X11::X11)
target_link_libraries(gwenviewlib X11::X11)
if (QT_MAJOR_VERSION STREQUAL "5")
target_link_libraries(gwenviewlib Qt5::X11Extras)
else()
MESSAGE(STATUS "need to replace Qt5::X11Extras in qt6")
endif()
endif()
if (QT_MAJOR_VERSION STREQUAL "6")
......
......@@ -49,8 +49,10 @@ extern "C" {
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <fixx11h.h>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QtX11Extras/QX11Info>
#endif
#endif
// local
#include "gwenview_lib_debug.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment