From b9d6a977112165fc17abcb9797415215a2d6cf6e Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sun, 29 Apr 2018 17:07:18 +0200 Subject: [PATCH] Bundle dolphinui.rc also in dolphinmainwindowtest Otherwise the test executable will not be able to find the .rc file while creating a DolphinMainWindow instance. We also need to force the component name to `dolphin`, otherwise kxmlgui will default to the name of the binary (which in this case would be dolphinmainwindowtest rather than dolphin). --- src/dolphinmainwindow.cpp | 2 +- src/tests/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 6071f42db4..b07849ccd4 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -105,7 +105,7 @@ DolphinMainWindow::DolphinMainWindow() : m_tearDownFromPlacesRequested(false) { Q_INIT_RESOURCE(dolphin); - + setComponentName(QStringLiteral("dolphin"), QGuiApplication::applicationDisplayName()); setObjectName(QStringLiteral("Dolphin#")); connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage, diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index c656173a8d..07e4257a0b 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -54,10 +54,14 @@ TEST_NAME viewpropertiestest LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) # DolphinMainWindowTest -ecm_add_test(dolphinmainwindowtest.cpp +set(dolphinmainwindowtest_SRCS dolphinmainwindowtest.cpp) +qt5_add_resources(dolphinmainwindowtest_SRCS ${CMAKE_SOURCE_DIR}/src/dolphin.qrc) + +ecm_add_test(${dolphinmainwindowtest_SRCS} TEST_NAME dolphinmainwindowtest LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) +# DragAndDropHelperTest ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test) # PlacesItemModelTest