From 953b25367651d222059b1ea50403079eb7c2a3e3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 19 May 2021 22:10:14 +0200 Subject: [PATCH] Use directly autorcc --- src/CMakeLists.txt | 6 ++---- src/tests/CMakeLists.txt | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 137f01c361..a8c4e18961 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -181,10 +181,9 @@ set(dolphinpart_SRCS dolphinpart.cpp dolphinpart_ext.cpp dolphindebug.cpp + dolphinpart.qrc ) -qt5_add_resources(dolphinpart_SRCS dolphinpart.qrc) - add_library(dolphinpart MODULE ${dolphinpart_SRCS}) kcoreaddons_desktop_to_json(dolphinpart ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.desktop) @@ -255,6 +254,7 @@ set(dolphinstatic_SRCS views/zoomlevelinfo.cpp dolphindebug.cpp global.cpp + dolphin.qrc ) if(HAVE_BALOO) @@ -292,8 +292,6 @@ kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC settings/dolphin_generalsettings.kcfgc ) -qt5_add_resources(dolphinstatic_SRCS dolphin.qrc) - qt5_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dolphinmainwindow.h org.kde.DolphinMainWindow.xml) qt5_add_dbus_adaptor(dolphinstatic_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindow.h DolphinMainWindow) qt5_add_dbus_interface(dolphinstatic_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindowinterface) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 692b7756fd..b628c5ce43 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -62,8 +62,7 @@ TEST_NAME viewpropertiestest LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) # DolphinMainWindowTest -set(dolphinmainwindowtest_SRCS dolphinmainwindowtest.cpp) -qt5_add_resources(dolphinmainwindowtest_SRCS ${CMAKE_SOURCE_DIR}/src/dolphin.qrc) +set(dolphinmainwindowtest_SRCS dolphinmainwindowtest.cpp ${CMAKE_SOURCE_DIR}/src/dolphin.qrc) ecm_add_test(${dolphinmainwindowtest_SRCS} TEST_NAME dolphinmainwindowtest