Commit 3bef8511 authored by Ralf Habacker's avatar Ralf Habacker
Browse files

Include umbrelloui.rc into executable to avoid finding issue on KF5.

BUG:369079
FIXED-IN:2.20.80 (KDE Applications 16.11.80)
parent f6a3dc22
......@@ -530,9 +530,9 @@ if(NOT BUILD_KF5)
target_link_libraries(umbrello ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS} libumbrello)
else()
if(CMAKE_MAJOR_VERSION LESS 3)
qt5_add_resources(libumbrello_SRCS icons.qrc)
qt5_add_resources(libumbrello_SRCS icons.qrc ui.qrc)
else()
list(APPEND libumbrello_SRCS icons.qrc)
list(APPEND libumbrello_SRCS icons.qrc ui.qrc)
endif()
add_library(libumbrello ${LIB_BUILD_MODE} ${libumbrello_SRCS})
set_target_properties(libumbrello PROPERTIES OUTPUT_NAME umbrello)
......@@ -583,9 +583,6 @@ else()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop "${UMBRELLO_DESKTOP_OUT}")
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello.desktop)
install( FILES org.kde.umbrello.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR})
install( FILES
umbrelloui.rc
DESTINATION ${KXMLGUI_INSTALL_DIR}/umbrello )
endif()
install( FILES
......
......@@ -163,6 +163,7 @@ int main(int argc, char *argv[])
args->process(app);
aboutData.processCommandLine(args);
Q_INIT_RESOURCE(ui);
#else
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineOptions options;
......
<RCC>
<qresource prefix="/kxmlgui5/umbrello">
<file>umbrelloui.rc</file>
</qresource>
</RCC>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment