Amend 18c310a8 for cmake build: Get rid of QPA_XCB define

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b6538e4b15ace6dee677468416046bbc58bb956..590ee9ed69799273d4687476d963d514885e4fc3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -812,7 +812,6 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
                        Qt5_wrap_ui(${ARGN})
                endmacro()
        endif()
-       # set QPA_XCB if QT uses X11
        find_package(${QtVal}Core CONFIG REQUIRED)
        if (${QtVal}Core_FOUND)
                find_package(${QtVal}Widgets CONFIG REQUIRED)
@@ -1186,6 +1185,7 @@ get_data_destination(dest_data)
 list(APPEND tmp_vi "  LyX files dir:           ${CMAKE_INSTALL_PREFIX}/${dest_data}")
 string(REPLACE ";" "\\n" VERSION_INFO "${tmp_vi}")
 
+# the result XCB_LIBRARY will be used in src/CMakeLists.txt and also in configuring config.h
 find_library(XCB_LIBRARY NAMES xcb)
 if (XCB_LIBRARY)
   set(HAVE_LIBXCB 1 CACHE BOOL "" FORCE)

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index ed9328fdcda3954cc3e3ff61af290d2b2758a240..7e6707ca59bc196a87416a0ed89f83504fa54e6e 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -275,7 +275,6 @@ else()
   endif()
 endif()
 
-set(QPA_XCB)
 set(HAVE_QT5_X11_EXTRAS)
 set(HAVE_QT6_X11_EXTRAS)
 if (LYX_USE_QT MATCHES "QT5|QT6")
@@ -312,10 +311,6 @@ if (LYX_USE_QT MATCHES "QT5|QT6")
       }
       "
       QT_USES_X11)
-    if(QT_USES_X11 AND NOT LYX_USE_QT MATCHES "QT6")
-      set(QPA_XCB ${QT_USES_X11})
-      message(STATUS "Found QPA_XCB = ${QPA_XCB}")
-    endif()
   endif()
 
   if (${QtVal}X11Extras_FOUND)

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 856f9a8acc9d2668aaee3db2e0fae4b8aff73c18..6b5b82f8030d8ecc90840dee12ac2af171138c57 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -64,9 +64,6 @@
 
 #cmakedefine Z_PREFIX 1
 
-// Defined if QT=QT5 uses X11
-#cmakedefine QPA_XCB 1
-
 // Define if you have the Qt5X11Extras module
 #cmakedefine HAVE_QT5_X11_EXTRAS 1