diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
index 393ecfd..4db7bea 100644
--- a/kpartloader/CMakeLists.txt
+++ b/kpartloader/CMakeLists.txt
@@ -1,24 +1,26 @@
project(kpartloader)
########### kpartloader ###############
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE
COMPONENTS
Core
)
find_package(KF5 ${KF_MIN_VERSION} REQUIRED
COMPONENTS
CoreAddons
Parts
WidgetsAddons
)
set(kpartloader_SRCS
kpartloader.cpp
)
+qt5_add_resources(kpartloader_SRCS
+ kpartloader.qrc
+)
add_executable(kpartloader ${kpartloader_SRCS})
target_link_libraries(kpartloader KF5::Parts)
install(TARGETS kpartloader ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES kpartloaderui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kpartloader)
diff --git a/kpartloader/kpartloader.qrc b/kpartloader/kpartloader.qrc
new file mode 100644
index 0000000..ec730c1
--- /dev/null
+++ b/kpartloader/kpartloader.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kpartloaderui.rc
+
+
diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
index 7968bd5..527362b 100644
--- a/kuiviewer/CMakeLists.txt
+++ b/kuiviewer/CMakeLists.txt
@@ -1,94 +1,100 @@
project(kuiviewer)
include(ECMAddAppIcon)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE
COMPONENTS
Core
Designer
UiTools
)
find_package(KF5 ${KF_MIN_VERSION} REQUIRED
COMPONENTS
CoreAddons
KIO
Parts
)
add_definitions(
-DQT_DEPRECATED_WARNINGS
-DQT_DISABLE_DEPRECATED_BEFORE=0x050900
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_STRICT_ITERATORS
-DQT_USE_QSTRINGBUILDER
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_NO_URL_CAST_FROM_STRING
)
########### next target ###############
set(kuiviewer_SRCS main.cpp kuiviewer.cpp )
+qt5_add_resources(kuiviewer_SRCS
+ kuiviewer.qrc
+)
+
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kuiviewer.png")
ecm_add_app_icon(kuiviewer_SRCS ICONS ${ICONS_SRCS})
add_executable(kuiviewer ${kuiviewer_SRCS})
target_link_libraries(kuiviewer KF5::Parts )
install(TARGETS kuiviewer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### next target ###############
set(kuiviewerpart_PART_SRCS kuiviewer_part.cpp )
+qt5_add_resources(kuiviewerpart_PART_SRCS
+ kuiviewer_part.qrc
+)
+
ecm_qt_declare_logging_category(kuiviewerpart_PART_SRCS
HEADER kuiviewer_part_debug.h
IDENTIFIER KUIVIEWERPART
CATEGORY_NAME "kuiviewerpart"
)
add_library(kuiviewerpart MODULE ${kuiviewerpart_PART_SRCS})
kcoreaddons_desktop_to_json(kuiviewerpart kuiviewer_part.desktop)
target_link_libraries(kuiviewerpart KF5::Parts Qt5::Designer Qt5::UiTools)
install(TARGETS kuiviewerpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts )
########### next target ###############
set(quithumbnail_PART_SRCS quicreator.cpp )
add_library(quithumbnail MODULE ${quithumbnail_PART_SRCS})
target_link_libraries(quithumbnail
KF5::KIOWidgets
Qt5::Designer
Qt5::UiTools
)
install(TARGETS quithumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install( PROGRAMS org.kde.kuiviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES designerthumbnail.desktop kuiviewer_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-install( FILES kuiviewer_part.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kuiviewerpart )
-install( FILES kuiviewerui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kuiviewer )
ecm_install_icons(ICONS
16-apps-kuiviewer.png
32-apps-kuiviewer.png
48-apps-kuiviewer.png
64-apps-kuiviewer.png
128-apps-kuiviewer.png
sc-apps-kuiviewer.svg
DESTINATION ${KDE_INSTALL_ICONDIR}
THEME hicolor
)
diff --git a/kuiviewer/kuiviewer.qrc b/kuiviewer/kuiviewer.qrc
new file mode 100644
index 0000000..e2f7eba
--- /dev/null
+++ b/kuiviewer/kuiviewer.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kuiviewerui.rc
+
+
diff --git a/kuiviewer/kuiviewer_part.qrc b/kuiviewer/kuiviewer_part.qrc
new file mode 100644
index 0000000..95b6860
--- /dev/null
+++ b/kuiviewer/kuiviewer_part.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kuiviewer_part.rc
+
+