Amend 2d48072e: Get rid of Qt resources

Remove the cmake handling too

diff --git a/development/cmake/scripts/LyXCreateImagesResource.cmake b/development/cmake/scripts/LyXCreateImagesResource.cmake
deleted file mode 100644 (file)
index 0d6bca3..0000000
--- a/development/cmake/scripts/LyXCreateImagesResource.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-#  Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
-#                2012, Kornel Benko, <kornel@lyx.org>
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  1. Redistributions of source code must retain the copyright
-#         notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the copyright
-#         notice, this list of conditions and the following disclaimer in the
-#         documentation and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#         derived from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-#  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-#  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-#  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-#  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-#  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# To call this script, one has to provide following parameters
-# IMAGES_DIR                # root for the directory-tree for .png, .svgz and .git image files 
-# RESOURCE_NAME             # full path of the resulting resource-file
-# MAPPED_DIR                # Path-prefix to be removed from the file name entries
-
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
-if(NOT RESOURCE_NAME)
-  message(FATAL_ERROR "RESOURCE_NAME not given")
-endif()
-
-message(STATUS "Generating ${RESOURCE_NAME}")
-
-if(NOT IS_DIRECTORY ${IMAGES_DIR})
-  message(FATAL_ERROR "Directory ${IMAGES_DIR} does not exist")
-endif()
-
-if(NOT EXISTS ${MAPPED_DIR})
-  message(FATAL_ERROR "Directory ${MAPPED_DIR} does not exist")
-endif()
-
-file(GLOB_RECURSE images_png      ${IMAGES_DIR}/*.png)
-file(GLOB_RECURSE images_gif      ${IMAGES_DIR}/*.gif)
-file(GLOB_RECURSE images_svgz      ${IMAGES_DIR}/*.svgz)
-
-set(images ${images_png} ${images_gif} ${images_svgz})
-list(SORT images)
-
-file(REMOVE ${RESOURCE_NAME})
-if(EXISTS ${RESOURCE_NAME})
-  message(FATAL_ERROR "Cannot remove file ${RESOURCE_NAME}")
-endif()
-
-file(WRITE ${RESOURCE_NAME} "<!DOCTYPE RCC><RCC version=\"1.0\">\n")
-file(APPEND ${RESOURCE_NAME} "<qresource>\n")
-
-foreach (_current_FILE ${images})
-  get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
-  string(REGEX REPLACE "${MAPPED_DIR}" "" _file_name ${_abs_FILE})
-  file(APPEND ${RESOURCE_NAME} "        <file alias=\"${_file_name}\">${_abs_FILE}</file>\n")
-endforeach (_current_FILE)
-
-# copy lyx.svg too (and use versioning)
-get_filename_component(_abs_FILE "${IMAGES_DIR}/lyx.svg" ABSOLUTE)
-string(REGEX REPLACE "${MAPPED_DIR}" "" _file_name ${_abs_FILE})
-file(APPEND ${RESOURCE_NAME} "         <file alias=\"lyx${SUFFIX}\">${_abs_FILE}</file>\n")
-
-file(APPEND ${RESOURCE_NAME} "</qresource>\n")
-file(APPEND ${RESOURCE_NAME} "</RCC>\n")
-
-if(NOT EXISTS ${RESOURCE_NAME})
-  message(FATAL_ERROR "File ${RESOURCE_NAME} could not be created")
-endif()

diff --git a/src/frontends/qt/CMakeLists.txt b/src/frontends/qt/CMakeLists.txt
index f4a60de65cedfb0107179994f9839e5730ca429e..4c2f454e1ac7a301b9cc50336cd1f8b4a71a2b1d 100644 (file)
--- a/src/frontends/qt/CMakeLists.txt
+++ b/src/frontends/qt/CMakeLists.txt
@@ -14,7 +14,6 @@ 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)
-list(REMOVE_ITEM frontends_qt_sources ${TOP_SRC_DIR}/src/frontends/qt/Resources.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)
@@ -25,20 +24,6 @@ lyx_automoc(${frontends_qt_sources})
 
 lyx_add_ui_files(frontends_qt_sources ui_files ${frontend_qt_UI})
 
-set(resource_name ${CMAKE_CURRENT_BINARY_DIR}/Resources.qrc)
-
-add_custom_command(
-       OUTPUT  ${resource_name}
-       COMMAND ${CMAKE_COMMAND}
-               -DIMAGES_DIR=${TOP_SRC_DIR}/lib/images
-               -DRESOURCE_NAME=${resource_name}
-               -DMAPPED_DIR=${TOP_SRC_DIR}/lib/
-                -DSUFFIX=${LYX_INSTALL_SUFFIX}
-               -P ${TOP_SCRIPT_PATH}/LyXCreateImagesResource.cmake
-       )
-
-qt_add_resources(resource_files ${resource_name})
-
 add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT_FRONTEND)
 
 include_directories(