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

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 9e30c407f0ed296058b822248a49af26a5e10400..fd14bd254637faa59a9aa84a79146c481f6e7871 100755 (executable)
--- 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 867b838c807b4192ccc7c0342bd62195f550ac8c..97e1265dc827da543e9d40e9fdc3523977408330 100644 (file)
--- 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 ff61e48c66ef0c86ae55e2efad60d0e988319eab..f4a60de65cedfb0107179994f9839e5730ca429e 100644 (file)
--- 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})