diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ad53f58717..9aefba82b7 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,72 +1,70 @@
find_package(KF5Plasma)
set_package_properties(KF5Plasma PROPERTIES
PURPOSE "Plasma libraries for enabling the plasma addons"
URL "http://www.kde.org"
TYPE OPTIONAL)
if(KF5Plasma_FOUND)
add_subdirectory(plasma)
endif()
find_package(SharedMimeInfo REQUIRED)
set(kdevelop_SRCS main.cpp kdevideextension.cpp splash.cpp)
# kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
if(APPLE)
#kde4_add_app_icon(kdevelop_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/kdevelop.png")
else()
#kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
endif(APPLE)
+qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
add_executable(kdevelop ${kdevelop_SRCS} )
target_link_libraries(kdevelop
KDev::Interfaces
KDev::Shell
KF5::Declarative
KF5::IconThemes
Qt5::Quick
)
IF(APPLE)
target_link_libraries(kdevelop "-framework CoreFoundation")
ENDIF()
install(TARGETS kdevelop ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES kdevelop! DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
if(APPLE)
#kde4_add_app_icon(kdevelop_bin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/kdevelop.png")
else()
#kde4_add_app_icon(kdevelop_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
endif(APPLE)
if (APPLE)
# the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake,
# so has to be set for all targets in this cmake file
set(MACOSX_BUNDLE_DISPLAY_NAME KDevelop)
# We provide our own Info.plist to disable AppNap for KDevelop:
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.KDevelop")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDevelop")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "KDevelop")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_STRING "The KDevelop Integrated Development Environment")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_ICON_FILE "kdevelop_SRCS.icns")
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_COPYRIGHT "KDevelop Team")
endif (APPLE)
########### install files ###############
install( PROGRAMS kdevelop.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( PROGRAMS kdevelop_ps.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-install( FILES kdeveloprc DESTINATION ${KDE_INSTALL_CONFDIR} )
-install( FILES kdevelopui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevelop )
install( FILES kdevelop.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
install( FILES kdevelop.xml kdevelopinternal.xml DESTINATION ${KDE_INSTALL_MIMEDIR} )
-install( FILES splash.qml DESTINATION ${KDE_INSTALL_DATADIR}/kdevelop )
update_xdg_mimetypes( ${KDE_INSTALL_MIMEDIR} )
diff --git a/app/kdevelop.qrc b/app/kdevelop.qrc
new file mode 100644
index 0000000000..a9263d93c7
--- /dev/null
+++ b/app/kdevelop.qrc
@@ -0,0 +1,12 @@
+
+
+
+ splash.qml
+
+
+ kdeveloprc
+
+
+ kdevelopui.rc
+
+
diff --git a/app/splash.cpp b/app/splash.cpp
index 127177da98..46796cfdd5 100644
--- a/app/splash.cpp
+++ b/app/splash.cpp
@@ -1,78 +1,77 @@
/***************************************************************************
* Copyright 2013 Sven Brauch *
* Copyright 2013 Milian Wolff *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *
* published by the Free Software Foundation; either version 2 of the *
* License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "splash.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include "config.h"
KDevSplashScreen::KDevSplashScreen()
: QQuickView()
{
setFlags(Qt::FramelessWindowHint | Qt::SplashScreen);
setResizeMode(QQuickView::SizeViewToRootObject);
- QString splashScript = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdevelop/splash.qml");
- setSource(QUrl::fromLocalFile(splashScript));
+ setSource(QUrl(QStringLiteral("qrc:/kdevelop/splash.qml")));
if (!rootObject()) {
- qWarning() << "Could not find KDevelop splash screen: kdevelop/splash.qml" << splashScript;
+ qWarning() << "Could not load KDevelop splash screen";
hide(); // hide instead of showing garbage
return;
}
if (rootObject()) {
rootObject()->setProperty("appIcon",
QUrl::fromLocalFile(KIconLoader().iconPath("kdevelop", -48)));
rootObject()->setProperty("appVersionMajor", VERSION_MAJOR);
rootObject()->setProperty("appVersionMinor", VERSION_MINOR);
rootObject()->setProperty("appVersionPatch", VERSION_PATCH);
}
QRect geo = geometry();
geo.moveCenter(screen()->geometry().center());
setGeometry(geo);
}
KDevSplashScreen::~KDevSplashScreen()
{
}
void KDevSplashScreen::progress(int progress)
{
// notify the QML script of the progress change
if (rootObject()) {
rootObject()->setProperty("progress", progress);
}
// note: We don't have an eventloop running, hence we need to call both processEvents and sendPostedEvents here
// DeferredDelete events alone won't be processed until sendPostedEvents is called
// also see: http://osxr.org/qt/source/qtbase/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp#1401
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
qApp->sendPostedEvents(0, QEvent::DeferredDelete);
}
diff --git a/debuggers/gdb/CMakeLists.txt b/debuggers/gdb/CMakeLists.txt
index 6d355f3003..57eab84988 100644
--- a/debuggers/gdb/CMakeLists.txt
+++ b/debuggers/gdb/CMakeLists.txt
@@ -1,142 +1,139 @@
project(gdb)
add_definitions(-DTRANSLATION_DOMAIN=\"kdevgdb\")
# TODO KF5 figure out how to get the process selection widget (ksysguardprocesslist.h)
function(add_debuggable_executable target)
cmake_parse_arguments(add_debuggable_executable "" "" "SRCS" ${ARGN})
add_executable(${target} ${add_debuggable_executable_SRCS})
# force debug symbols for our debuggees, disable optimizations
if (WIN32)
set(_flags "/0d")
else()
set(_flags "-O0")
endif()
set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${_flags}")
endfunction()
if(NOT APPLE)
# macro_optional_find_package( KDE4Workspace 4.2.0 )
# macro_log_feature( KDE4WORKSPACE_FOUND
# "KDE 4 Workspace" "KDE 4 Workspace libraries" "kdebase/workspace" FALSE
# "" "Required for building the process selection dialog for attaching GDB to a running process."
# )
endif(NOT APPLE)
if(KDE4WORKSPACE_FOUND)
include_directories(
${KDE4WORKSPACE_INCLUDE_DIR}
)
add_definitions(
-DKDEV_ENABLE_GDB_ATTACH_DIALOG
)
endif()
if (CMAKE_VERSION VERSION_GREATER "2.9" OR NOT CMAKE_GENERATOR MATCHES "Ninja")
set(HAVE_PATH_WITH_SPACES_TEST TRUE)
else()
message(WARNING "Disabling 'path with spaces' test, this CMake version would create a faulty build.ninja file. Upgrade to at least CMake v3.0")
endif()
add_subdirectory(unittests)
add_subdirectory(printers)
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
#add_subdirectory(tests)
########### next target ###############
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
set(kdevgdb_SRCS
debuggerplugin.cpp
gdb.cpp
gdbcommandqueue.cpp
gdbcommand.cpp
stty.cpp
disassemblewidget.cpp
gdboutputwidget.cpp
# debuggertracingdialog.cpp
breakpointcontroller.cpp
mi/gdbmi.cpp
mi/milexer.cpp
mi/miparser.cpp
stringhelpers.cpp
debugsession.cpp
gdbconfigpage.cpp
debugjob.cpp
selectcoredialog.cpp
variablecontroller.cpp
gdbframestackmodel.cpp
gdbvariable.cpp
registers/registersview.cpp
registers/registercontroller.cpp
registers/registersmanager.cpp
registers/registercontroller_x86.cpp
registers/registercontroller_arm.cpp
registers/modelsmanager.cpp
registers/converters.cpp
)
if(OKTETA_FOUND)
add_definitions(-DWITH_OKTETA=1)
list(APPEND kdevgdb_SRCS
memviewdlg.cpp)
endif()
if(KDE4WORKSPACE_FOUND)
set(kdevgdb_SRCS
${kdevgdb_SRCS}
processselection.cpp
)
endif(KDE4WORKSPACE_FOUND)
set(kdevgdb_UI
debuggertracingdialog.ui
gdbconfigpage.ui
selectcoredialog.ui
selectaddressdialog.ui
registers/registersview.ui
)
kde_enable_exceptions()
ki18n_wrap_ui(kdevgdb_SRCS ${kdevgdb_UI})
+qt5_add_resources(kdevgdb_SRCS kdevgdb.qrc)
kdevplatform_add_plugin(kdevgdb JSON kdevgdb.json SOURCES ${kdevgdb_SRCS})
target_link_libraries(kdevgdb
KDev::Sublime
KDev::Interfaces
KDev::Language
KDev::Debugger
KDev::OutputView
KDev::Project
KDev::Util
KF5::TextEditor
${KDE4WORKSPACE_PROCESSUI_LIBS}
)
set(test_gdb_SRCS unittests/test_gdb.cpp ${kdevgdb_SRCS})
ecm_add_test(${test_gdb_SRCS}
TEST_NAME test_gdb
LINK_LIBRARIES
Qt5::Test
KDev::Shell
KDev::Interfaces
KDev::Project
KDev::Debugger
KDev::Tests
KDev::Util
KF5::KIOWidgets
KF5::TextEditor
KF5::Parts
${KDE4WORKSPACE_PROCESSUI_LIBS}
)
if (HAVE_PATH_WITH_SPACES_TEST)
set_target_properties(test_gdb PROPERTIES COMPILE_FLAGS "-DHAVE_PATH_WITH_SPACES_TEST")
endif()
-
-########### install files ###############
-
-install( FILES kdevgdbui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevgdb )
diff --git a/debuggers/gdb/kdevgdb.qrc b/debuggers/gdb/kdevgdb.qrc
new file mode 100644
index 0000000000..9706684e11
--- /dev/null
+++ b/debuggers/gdb/kdevgdb.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevgdbui.rc
+
+
diff --git a/documentation/qthelp/CMakeLists.txt b/documentation/qthelp/CMakeLists.txt
index acbe698ce1..788fd0cf56 100644
--- a/documentation/qthelp/CMakeLists.txt
+++ b/documentation/qthelp/CMakeLists.txt
@@ -1,26 +1,25 @@
add_definitions(-DTRANSLATION_DOMAIN=\"kdevqthelp\")
set(kdevqthelp_SRCS
qthelpplugin.cpp
qthelpproviderabstract.cpp
qthelpprovider.cpp
qthelpdocumentation.cpp
qthelpqtdoc.cpp
qthelp_config_shared.cpp
debug.cpp
qthelpconfig.cpp # Configuration module for QtHelp plugin
)
ki18n_wrap_ui(kdevqthelp_SRCS
qthelpconfig.ui
qthelpconfigeditdialog.ui
)
+qt5_add_resources(kdevqthelp_SRCS kdevqthelp.qrc)
kdevplatform_add_plugin(kdevqthelp JSON kdevqthelp.json SOURCES ${kdevqthelp_SRCS})
target_link_libraries(kdevqthelp
KF5::KCMUtils KF5::I18n KF5::KIOWidgets KF5::TextEditor KF5::IconThemes Qt5::Help Qt5::WebKitWidgets KF5::NewStuff
KDev::Language KDev::Documentation KDev::Interfaces)
-install(FILES kdevelop-qthelp.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-
add_subdirectory(tests)
diff --git a/documentation/qthelp/kdevqthelp.qrc b/documentation/qthelp/kdevqthelp.qrc
new file mode 100644
index 0000000000..ea56812fec
--- /dev/null
+++ b/documentation/qthelp/kdevqthelp.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevelop-qthelp.knsrc
+
+
diff --git a/languages/clang/CMakeLists.txt b/languages/clang/CMakeLists.txt
index aaaaf1b262..719f64be91 100644
--- a/languages/clang/CMakeLists.txt
+++ b/languages/clang/CMakeLists.txt
@@ -1,53 +1,53 @@
find_package(Clang 3.5 REQUIRED)
add_definitions(${LLVM_CFLAGS})
include_directories(${CLANG_INCLUDE_DIR})
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/version.h"
@ONLY
)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/libs
${KDevelop_SOURCE_DIR}/languages/plugin
)
add_subdirectory(tests)
add_definitions(
-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS -DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY
)
add_subdirectory(clangsettings)
add_subdirectory(duchain)
add_subdirectory(codecompletion)
add_subdirectory(codegen)
add_subdirectory(util)
set(kdevclangsupport_SRCS
clangparsejob.cpp
clangsupport.cpp
clanghighlighting.cpp
)
+qt5_add_resources(kdevclangsupport_SRCS kdevclangsupport.qrc)
+
kdevplatform_add_plugin(kdevclangsupport JSON kdevclangsupport.json SOURCES ${kdevclangsupport_SRCS})
target_link_libraries(kdevclangsupport
kdevclangduchain
kdevclangcodecompletion
kdevclangcodegen
kdevclangutil
sessionsettings
KF5::ThreadWeaver
KF5::TextEditor
KDev::Util
KDev::Project
)
-
-install(FILES kdevclangsupport.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevclangsupport)
diff --git a/languages/clang/kdevclangsupport.qrc b/languages/clang/kdevclangsupport.qrc
new file mode 100644
index 0000000000..d53d79266e
--- /dev/null
+++ b/languages/clang/kdevclangsupport.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevclangsupport.rc
+
+
diff --git a/languages/cpp/CMakeLists.txt b/languages/cpp/CMakeLists.txt
index fe1e19f820..23bf2e4987 100644
--- a/languages/cpp/CMakeLists.txt
+++ b/languages/cpp/CMakeLists.txt
@@ -1,66 +1,64 @@
project(cpp)
add_definitions(-DTRANSLATION_DOMAIN=\"kdevcpp\")
include(CppBuildConfig.cmake)
include_directories(
${KDevelop_SOURCE_DIR}/languages/cpp/parser
${KDevelop_SOURCE_DIR}/languages/cpp/cppduchain
${KDevelop_SOURCE_DIR}/languages/plugins
)
add_subdirectory(parser)
add_subdirectory(cppduchain)
add_subdirectory(tests)
########### next target ###############
set(kdevcpplanguagesupport_PART_SRCS
cpplanguagesupport.cpp
includepathcomputer.cpp
cppparsejob.cpp
preprocessjob.cpp
cpphighlighting.cpp
cpputils.cpp
setuphelpers.cpp
quickopen.cpp
codecompletion/model.cpp
codecompletion/worker.cpp
codecompletion/context.cpp
codecompletion/item.cpp
codecompletion/helpers.cpp
codecompletion/missingincludeitem.cpp
codecompletion/implementationhelperitem.cpp
# codegen/cppnewclass.cpp
codegen/simplerefactoring.cpp
codegen/adaptsignatureassistant.cpp
codegen/adaptsignatureaction.cpp
codegen/unresolvedincludeassistant.cpp
codegen/cppclasshelper.cpp
# codegen/makeimplementationprivate.cpp
)
option(BUILD_uiblocktester "Build a debug thread into the plugin that checks for UI-thread lockups" OFF)
if(BUILD_uiblocktester)
add_definitions(-DDEBUG_UI_LOCKUP)
endif(BUILD_uiblocktester)
+qt5_add_resources(kdevcpplanguagesupport_PART_SRCS kdevcppsupport.qrc)
+
kdevplatform_add_plugin(kdevcpplanguagesupport JSON kdevcppsupport.json
SOURCES ${kdevcpplanguagesupport_PART_SRCS})
target_link_libraries(kdevcpplanguagesupport
kdevcpprpp
kdevcppduchain
kdevcppparser
KDev::Interfaces
KDev::Language
KDev::Project
KDev::Util
${KDE4_THREADWEAVER_LIBRARIES}
KF5::IconThemes
KF5::TextEditor
)
-
-########### install files ###############
-
-install(FILES kdevcppsupport.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevcppsupport)
diff --git a/languages/cpp/kdevcppsupport.qrc b/languages/cpp/kdevcppsupport.qrc
new file mode 100644
index 0000000000..d81be93755
--- /dev/null
+++ b/languages/cpp/kdevcppsupport.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevcppsupport.rc
+
+
diff --git a/projectbuilders/makebuilder/CMakeLists.txt b/projectbuilders/makebuilder/CMakeLists.txt
index aee0c168ea..a11042c4e3 100644
--- a/projectbuilders/makebuilder/CMakeLists.txt
+++ b/projectbuilders/makebuilder/CMakeLists.txt
@@ -1,32 +1,32 @@
project(makebuilder)
add_definitions(-DTRANSLATION_DOMAIN=\"kdevmakebuilder\")
########### next target ###############
set(kdevmakebuilder_SRCS
makebuilder.cpp
makejob.cpp
makebuilderpreferences.cpp
)
ki18n_wrap_ui(kdevmakebuilder_SRCS makeconfig.ui)
kconfig_add_kcfg_files( kdevmakebuilder_SRCS makebuilderconfig.kcfgc )
#add_library(kdevmakebuilder MODULE ${kdevmakebuilder_SRCS})
+qt5_add_resources(kdevmakebuilder_SRCS kdevmakebuilder.qrc)
kdevplatform_add_plugin(kdevmakebuilder JSON kdevmakebuilder.json SOURCES ${kdevmakebuilder_SRCS})
target_link_libraries(kdevmakebuilder
KF5::TextEditor
KDev::Interfaces
KDev::Project
KDev::OutputView
KDev::Shell
KDev::Util
KDev::Shell
)
########### install files ###############
#install(TARGETS kdevmakebuilder DESTINATION ${PLUGIN_INSTALL_DIR}/kdevplatform/${KDEV_PLUGIN_VERSION} )
install(FILES imakebuilder.h DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/make COMPONENT Devel)
#configure_file(kdevmakebuilder.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevmakebuilder.desktop)
#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevmakebuilder.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-# install( FILES kdevmakebuilder.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevmakebuilder )
diff --git a/projectbuilders/makebuilder/kdevmakebuilder.qrc b/projectbuilders/makebuilder/kdevmakebuilder.qrc
new file mode 100644
index 0000000000..66e9850ab9
--- /dev/null
+++ b/projectbuilders/makebuilder/kdevmakebuilder.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevmakebuilder.rc
+
+
diff --git a/projectmanagers/custommake/CMakeLists.txt b/projectmanagers/custommake/CMakeLists.txt
index 1f8ecbc4d1..0bf4ea440b 100644
--- a/projectmanagers/custommake/CMakeLists.txt
+++ b/projectmanagers/custommake/CMakeLists.txt
@@ -1,26 +1,22 @@
project(custommakemanager)
add_definitions(-DTRANSLATION_DOMAIN=\"kdevcustommake\")
include_directories(
${makebuilder_SOURCE_DIR}
)
########### next target ###############
set(kdevcustommakemanager_PART_SRCS
custommakemanager.cpp
custommakemodelitems.cpp
)
+qt5_add_resources(kdevcustommakemanager_PART_SRCS kdevcustommakemanager.qrc)
kdevplatform_add_plugin(kdevcustommakemanager JSON kdevcustommakemanager.json SOURCES ${kdevcustommakemanager_PART_SRCS})
target_link_libraries(kdevcustommakemanager
KF5::KIOWidgets KDev::Interfaces KDev::Project KDev::Util KDev::Language
kdevmakefileresolver
)
-
-########### install files ###############
-
-install( FILES kdevcustommakemanager.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevcustommakemanager )
-
add_subdirectory(makefileresolver)
diff --git a/projectmanagers/custommake/kdevcustommakemanager.qrc b/projectmanagers/custommake/kdevcustommakemanager.qrc
new file mode 100644
index 0000000000..771795b1e4
--- /dev/null
+++ b/projectmanagers/custommake/kdevcustommakemanager.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevcustommakemanager.rc
+
+
diff --git a/utils/okteta/CMakeLists.txt b/utils/okteta/CMakeLists.txt
index 185a0b5b83..784628b9f9 100644
--- a/utils/okteta/CMakeLists.txt
+++ b/utils/okteta/CMakeLists.txt
@@ -1,42 +1,42 @@
project( okteta )
add_definitions(-DTRANSLATION_DOMAIN=\"kdevokteta\")
include_directories( ${okteta_SOURCE_DIR} ${okteta_BINARY_DIR} )
add_definitions(
-DKASTEN_VERSION=${LIBKASTEN_VERSION}
)
include_directories(
${LIBKASTEN_INCLUDE_DIRS}
${LIBOKTETA_INCLUDE_DIRS}
${LIBOKTETAKASTEN_INCLUDE_DIRS}
)
SET( kdevokteta_PART_SRCS
kastentoolviewwidget.cpp
oktetatoolviewfactory.cpp
oktetaplugin.cpp
oktetadocument.cpp
oktetaview.cpp
oktetawidget.cpp
)
+qt5_add_resources(kdevokteta_PART_SRCS kdevokteta.qrc)
add_library(kdevokteta MODULE ${kdevokteta_PART_SRCS} )
TARGET_LINK_LIBRARIES( kdevokteta
${LIBOKTETAKASTEN_LIBRARIES}
${LIBOKTETA_LIBRARIES}
${LIBKASTEN_LIBRARIES}
KDev::Interfaces
KDev::Project
KDev::Sublime
KDev::Shell
KF5::WidgetsAddons
)
install(TARGETS kdevokteta DESTINATION ${PLUGIN_INSTALL_DIR}/kdevplatform/${KDEV_PLUGIN_VERSION})
configure_file(kdevokteta.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevokteta.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevokteta.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install(FILES kdevokteta.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevokteta )
diff --git a/utils/okteta/kdevokteta.qrc b/utils/okteta/kdevokteta.qrc
new file mode 100644
index 0000000000..3bc0c1e383
--- /dev/null
+++ b/utils/okteta/kdevokteta.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevokteta.rc
+
+