anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend(2) 580dea63: get rid of Qt4 code also in cmake build

Browse Source
This commit is contained in:
Kornel Benko 2022-11-21 09:31:48 +01:00
parent 4603363fbc
commit 43d506b104
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -767,7 +767,7 @@ if(LYX_USE_QT MATCHES "AUTO")
message(FATAL_ERROR "No appropriate QT-version found") message(FATAL_ERROR "No appropriate QT-version found")
endif() endif()
else() else()
set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE) message(FATAL_ERROR "No appropriate QT-version found")
endif() endif()
endif() endif()
endif() endif()

4
INSTALL.cmake
View File

@ -162,7 +162,7 @@ Build options
-- LYX_ENABLE_KEYTESTS = ON : Enable for keytests -- LYX_ENABLE_KEYTESTS = ON : Enable for keytests
-- LYX_ASAN = OFF : Use address sanitizer -- LYX_ASAN = OFF : Use address sanitizer
-- LYX_USE_FILEDIALOG = NATI : Use native or QT file dialog (QT NATIVE) -- 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_DISABLE_CALLSTACK_PRI= OFF : do not print a callstack when crashing
-- LYX_EXTERNAL_Z = ON : OFF := Build 3rdparty lib zlib -- LYX_EXTERNAL_Z = ON : OFF := Build 3rdparty lib zlib
-- LYX_EXTERNAL_ICONV = ON : OFF := Build 3rdparty lib iconvlib -- LYX_EXTERNAL_ICONV = ON : OFF := Build 3rdparty lib iconvlib
@ -262,7 +262,7 @@ Ubuntu/Kubuntu
You need additionally these packages: You need additionally these packages:
* g++ * g++
* cmake * 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

13
development/cmake/ConfigureChecks.cmake
View File

@ -348,19 +348,6 @@ if (LYX_USE_QT MATCHES "QT5|QT6")
set(CMAKE_REQUIRED_INCLUDES ${${QtVal}WinExtras_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${${QtVal}WinExtras_INCLUDE_DIRS})
set(CMAKE_REQUIRED_FLAGS ${${QtVal}WinExtras_EXECUTABLE_COMPILE_FLAGS}) set(CMAKE_REQUIRED_FLAGS ${${QtVal}WinExtras_EXECUTABLE_COMPILE_FLAGS})
endif() 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() else()
message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})") message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})")
endif() endif()

1
src/frontends/qt/CMakeLists.txt
View File

@ -13,7 +13,6 @@ endif()
file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt/${LYX_MOC_FILES}) 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 ${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 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) file(GLOB frontend_qt_UI ${TOP_SRC_DIR}/src/frontends/qt/ui/*.ui)