summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2016-09-19 20:59:39 (GMT)
committerRalf Habacker <ralf.habacker@freenet.de>2016-09-19 21:16:55 (GMT)
commit3bef8511ca5859e1345c798f8b38a9ae46dfdd72 (patch)
tree6d902182e09abe5f9ac02c27083fcb58fb367ec0
parentf6a3dc221c16e225ba93c312a9af969cf5676c7b (diff)
Include umbrelloui.rc into executable to avoid finding issue on KF5.
BUG:369079 FIXED-IN:2.20.80 (KDE Applications 16.11.80)
-rw-r--r--umbrello/CMakeLists.txt7
-rw-r--r--umbrello/main.cpp1
-rw-r--r--umbrello/ui.qrc5
3 files changed, 8 insertions, 5 deletions
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
index ac3ca48..76cd2f2 100644
--- a/umbrello/CMakeLists.txt
+++ b/umbrello/CMakeLists.txt
@@ -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
diff --git a/umbrello/main.cpp b/umbrello/main.cpp
index 12ebd65..dc260dd 100644
--- a/umbrello/main.cpp
+++ b/umbrello/main.cpp
@@ -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;
diff --git a/umbrello/ui.qrc b/umbrello/ui.qrc
new file mode 100644
index 0000000..664fbcf
--- /dev/null
+++ b/umbrello/ui.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/kxmlgui5/umbrello">
+ <file>umbrelloui.rc</file>
+ </qresource>
+</RCC>