]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Use directly autorcc
authorLaurent Montel <montel@kde.org>
Wed, 19 May 2021 20:10:14 +0000 (22:10 +0200)
committerLaurent Montel <montel@kde.org>
Wed, 19 May 2021 20:10:14 +0000 (22:10 +0200)
src/CMakeLists.txt
src/tests/CMakeLists.txt

index 137f01c36176f04d7e316dffffb437d8b819b93a..a8c4e189611d9f6c573ea21f0769ce593e9fba86 100644 (file)
@@ -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)
index 692b7756fd21a13f5cd0bc818015d73cb1d481ee..b628c5ce43881e80ee87ccd5f6c6e9b9470f8860 100644 (file)
@@ -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