From 43d506b104798ef50d651e10465c56e14240b476 Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Mon, 21 Nov 2022 09:31:48 +0100
Subject: [PATCH] Amend(2) 580dea63: get rid of Qt4 code also in cmake build

---
 CMakeLists.txt                          |  2 +-
 INSTALL.cmake                           |  4 ++--
 development/cmake/ConfigureChecks.cmake | 13 -------------
 src/frontends/qt/CMakeLists.txt         |  1 -
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f6e0f9db1..067b30cf3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -767,7 +767,7 @@ if(LYX_USE_QT MATCHES "AUTO")
 				message(FATAL_ERROR "No appropriate QT-version found")
 			endif()
 		else()
-			set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+			message(FATAL_ERROR "No appropriate QT-version found")
 		endif()
 	endif()
 endif()
diff --git a/INSTALL.cmake b/INSTALL.cmake
index e0e7afde4c..4d889e0fc4 100644
--- a/INSTALL.cmake
+++ b/INSTALL.cmake
@@ -162,7 +162,7 @@ Build options
     -- LYX_ENABLE_KEYTESTS      = ON     : Enable for keytests
     -- LYX_ASAN                 = OFF    : Use address sanitizer
     -- LYX_USE_FILEDIALOG       = NATI   : Use native or QT file dialog (QT NATIVE)
-    -- LYX_USE_QT               = QT5    : Use Qt version as frontend (AUTO QT4 QT5)
+    -- LYX_USE_QT               = QT6    : Use Qt version as frontend (AUTO QT5 QT6)
     -- LYX_DISABLE_CALLSTACK_PRI= OFF    : do not print a callstack when crashing
     -- LYX_EXTERNAL_Z           = ON     : OFF := Build 3rdparty lib zlib
     -- LYX_EXTERNAL_ICONV       = ON     : OFF := Build 3rdparty lib iconvlib
@@ -262,7 +262,7 @@ Ubuntu/Kubuntu
     You need additionally these packages:
       * g++
       * cmake
-      * qt4-dev-tools + qt4-qmake or qttools5-dev-tools + qt5-qmake
+      * qttools5-dev-tools + qt5-qmake or qt6-base-dev-tools + qt6-tools-dev
 
 
 
diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 16cc4ff03a..9062372c38 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -348,19 +348,6 @@ if (LYX_USE_QT MATCHES "QT5|QT6")
     set(CMAKE_REQUIRED_INCLUDES ${${QtVal}WinExtras_INCLUDE_DIRS})
     set(CMAKE_REQUIRED_FLAGS ${${QtVal}WinExtras_EXECUTABLE_COMPILE_FLAGS})
   endif()
-elseif(LYX_USE_QT MATCHES "QT4")
-  set(CMAKE_REQUIRED_LIBRARIES ${QT_QTGUI_LIBRARY})
-  set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
-  check_cxx_source_compiles(
-          "
-          #include <QtGui/QX11Info>
-          int main()
-          {
-            QX11Info *qxi = new QX11Info;
-            qxi->~QX11Info();
-          }
-          "
-  QT_USES_X11)
 else()
   message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})")
 endif()
diff --git a/src/frontends/qt/CMakeLists.txt b/src/frontends/qt/CMakeLists.txt
index 38f330143d..a007c2f492 100644
--- a/src/frontends/qt/CMakeLists.txt
+++ b/src/frontends/qt/CMakeLists.txt
@@ -13,7 +13,6 @@ endif()
 file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt/${LYX_MOC_FILES})
 
 list(REMOVE_ITEM frontends_qt_sources ${moc_files} .)
-list(REMOVE_ITEM frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt/liblyxqt4.cpp)
 
 file(GLOB frontends_qt_headers ${TOP_SRC_DIR}/src/frontends/qt/${LYX_HPP_FILES})
 file(GLOB frontend_qt_UI ${TOP_SRC_DIR}/src/frontends/qt/ui/*.ui)