diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt --- a/deploy/CMakeLists.txt +++ b/deploy/CMakeLists.txt @@ -1,8 +1,3 @@ - -install(FILES - "${CMAKE_CURRENT_SOURCE_DIR}/atelierui.rc" - DESTINATION ${KXMLGUI_INSTALL_DIR}/${PROJECT_NAME}/) - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/atelier.png" DESTINATION share/pixmaps) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory(dialogs) add_subdirectory(widgets) -add_executable(atelier ${atelier_SRCS} icons.qrc) +add_executable(atelier ${atelier_SRCS} resources.qrc) ecm_create_qm_loader(atelier_SRCS atelier) diff --git a/deploy/atelierui.rc b/src/atelierui.rc rename from deploy/atelierui.rc rename to src/atelierui.rc diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -229,7 +229,7 @@ action = actionCollection()->addAction(QStringLiteral("log"), ui->logDockWidget->toggleViewAction()); action->setText(i18n("Log")); - setupGUI(Default, "atelierui.rc"); + setupGUI(Default, ":/atelierui"); } void MainWindow::openFile() diff --git a/src/icons.qrc b/src/resources.qrc rename from src/icons.qrc rename to src/resources.qrc --- a/src/icons.qrc +++ b/src/resources.qrc @@ -2,5 +2,8 @@ ../deploy/atelier.png + + atelierui.rc +