From: Kornel Benko <kornel@lyx.org>
Date: Sat, 20 Jul 2019 22:44:17 +0000 (+0200)
Subject: Amend c293be56: Cmake part of 'Rename frontend qt4 to qt'
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a4428abe282734316e9ea9e18204b4dd6a5b0e6;p=features.git

Amend c293be56: Cmake part of 'Rename frontend qt4 to qt'
---

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 9e30c407f0..fd14bd2546 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -106,7 +106,7 @@ add_gettext_python(external lib/xtemplates *.xtemplate)
 add_gettext_python(formats lib configure.py)
 add_gettext_python(examples_templates lib examples/[a-zA-Z]* templates/[a-zA-Z]*)
 add_gettext_python(tabletemplates lib tabletemplates/*.lyx)
-add_gettext_python(qt4 src/frontends/qt4/ui *.ui)
+add_gettext_python(qt src/frontends/qt/ui *.ui)
 
 ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
diff --git a/src/frontends/CMakeLists.txt b/src/frontends/CMakeLists.txt
index 867b838c80..97e1265dc8 100644
--- a/src/frontends/CMakeLists.txt
+++ b/src/frontends/CMakeLists.txt
@@ -8,7 +8,7 @@ project(frontends)
 
 include_directories(${TOP_SRC_DIR}/src/frontends)
 
-add_subdirectory(qt4)
+add_subdirectory(qt)
 
 file(GLOB frontends_sources ${TOP_SRC_DIR}/src/frontends/${LYX_CPP_FILES})
 file(GLOB frontends_headers ${TOP_SRC_DIR}/src/frontends/${LYX_HPP_FILES})
diff --git a/src/frontends/qt/CMakeLists.txt b/src/frontends/qt/CMakeLists.txt
index ff61e48c66..f4a60de65c 100644
--- a/src/frontends/qt/CMakeLists.txt
+++ b/src/frontends/qt/CMakeLists.txt
@@ -6,20 +6,20 @@
 
 project(frontend_qt)
 
-file(GLOB frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
+file(GLOB frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt/${LYX_CPP_FILES})
 if (LYX_USE_FILEDIALOG MATCHES "NATIVE")
-  set_property(SOURCE "${TOP_SRC_DIR}/src/frontends/qt4/FileDialog.cpp" PROPERTY COMPILE_FLAGS -DUSE_NATIVE_FILEDIALOG=1)
+  set_property(SOURCE "${TOP_SRC_DIR}/src/frontends/qt/FileDialog.cpp" PROPERTY COMPILE_FLAGS -DUSE_NATIVE_FILEDIALOG=1)
 endif()
-file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${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 ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp)
-list(REMOVE_ITEM frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt4/Resources.cpp)
+list(REMOVE_ITEM frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt/liblyxqt4.cpp)
+list(REMOVE_ITEM frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt/Resources.cpp)
 
-file(GLOB frontends_qt_headers ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})
-file(GLOB frontend_qt_UI ${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui)
+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)
 
-lyx_add_msvc_pch(frontends_qt4)
+lyx_add_msvc_pch(frontends_qt)
 
 lyx_automoc(${frontends_qt_sources})
 
@@ -42,7 +42,7 @@ qt_add_resources(resource_files ${resource_name})
 add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT_FRONTEND)
 
 include_directories(
-	${TOP_SRC_DIR}/src/frontends/qt4
+	${TOP_SRC_DIR}/src/frontends/qt
 	${QT_INCLUDES}
 	${CMAKE_CURRENT_BINARY_DIR})