From 53f9194f6aa7b2df4576fd65718c08498be22db7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 22 Sep 2020 13:41:47 +1000 Subject: Fix for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt index ee01a04..0aef0d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,6 @@ endif() find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config Declarative - DocTools IconThemes I18n ItemModels @@ -187,7 +186,7 @@ add_subdirectory(app) add_subdirectory(app_templates) add_subdirectory(file_templates) add_subdirectory(shortcuts) -add_subdirectory(doc) +###add_subdirectory(doc) add_subdirectory(share) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KDevelop") @@ -216,6 +215,5 @@ install(FILES org.kde.kdevelop.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR # Make it possible to use the po files fetched by the fetch-translations step ki18n_install(po) -kdoctools_install(po) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/plugins/appwizard/CMakeLists.txt b/plugins/appwizard/CMakeLists.txt index 652c32e..6a8cb57 100644 --- a/plugins/appwizard/CMakeLists.txt +++ b/plugins/appwizard/CMakeLists.txt @@ -24,7 +24,9 @@ declare_qt_logging_category(kdevappwizard_PART_SRCS ki18n_wrap_ui(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI}) +if(NOT HAIKU) install(FILES kdevappwizard.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +endif() qt5_add_resources(kdevappwizard_PART_SRCS kdevappwizard.qrc) kdevplatform_add_plugin(kdevappwizard SOURCES ${kdevappwizard_PART_SRCS}) diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt index 0f0be21..f0961ec 100644 --- a/plugins/filetemplates/CMakeLists.txt +++ b/plugins/filetemplates/CMakeLists.txt @@ -33,7 +33,9 @@ ki18n_wrap_ui(kdevfiletemplates_PART_SRCS ui/testcases.ui ) +if(NOT HAIKU) install(FILES kdevfiletemplates.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +endif() qt5_add_resources(kdevfiletemplates_PART_SRCS kdevfiletemplates.qrc) kdevplatform_add_plugin(kdevfiletemplates SOURCES ${kdevfiletemplates_PART_SRCS}) diff --git a/plugins/qthelp/CMakeLists.txt b/plugins/qthelp/CMakeLists.txt index e7e3b69..332c95e 100644 --- a/plugins/qthelp/CMakeLists.txt +++ b/plugins/qthelp/CMakeLists.txt @@ -22,7 +22,9 @@ ki18n_wrap_ui(kdevqthelp_SRCS qthelpconfigeditdialog.ui ) +if(NOT HAIKU) install(FILES kdevelop-qthelp.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +endif() kdevplatform_add_plugin(kdevqthelp SOURCES ${kdevqthelp_SRCS}) target_link_libraries(kdevqthelp -- 2.45.2 From c7e66a497f28365fe2986756db424daf4f74280b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 26 Mar 2024 08:14:54 +0100 Subject: Use system theme diff --git a/kdevplatform/shell/mainwindow_p.cpp b/kdevplatform/shell/mainwindow_p.cpp index e553dd0..e7b2176 100644 --- a/kdevplatform/shell/mainwindow_p.cpp +++ b/kdevplatform/shell/mainwindow_p.cpp @@ -312,7 +312,9 @@ void MainWindowPrivate::setupActions() action->setWhatsThis( i18nc( "@info:whatsthis", "Adds a new tool view to this window." ) ); //Load themes +#ifndef Q_OS_HAIKU actionCollection()->addAction(QStringLiteral("colorscheme_menu"), new ColorSchemeChooser(actionCollection())); +#endif } void MainWindowPrivate::toggleArea(bool b) -- 2.45.2