diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ffcb34debd..0c56ce62e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -134,12 +134,16 @@ target_link_libraries(${_lyx}
 
 qt_use_modules(${_lyx} Core Gui)
 
-if(QT_HAS_X11_EXTRAS)
-  find_library(XCB_LIBRARY NAMES xcb)
-  if (XCB_LIBRARY MATCHES "NOTFOUND")
-    message(FATAL_ERROR "Need xcb library to use with QT5_X11_EXTRAS")
+if(QT_USES_X11)
+  find_package(X11 REQUIRED)
+  target_link_libraries(${_lyx} ${X11_X11_LIB}) # we need it because we use XSendEvent
+  if(HAVE_QT5_X11_EXTRAS)
+    find_library(XCB_LIBRARY NAMES xcb)
+    if (XCB_LIBRARY MATCHES "NOTFOUND")
+      message(FATAL_ERROR "Need xcb library to use with QT5_X11_EXTRAS")
+    endif()
+    target_link_libraries(${_lyx} ${LYX_QT5_X11_EXTRAS_LIBRARY} ${XCB_LIBRARY})
   endif()
-  target_link_libraries(${_lyx} ${LYX_QT5_X11_EXTRAS_LIBRARY} ${XCB_LIBRARY})
 endif()
 
 lyx_target_link_libraries(${_lyx} HUNSPELL ASPELL ENCHANT Magic)