diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # minimal requirements cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) set (QT_MIN_VERSION "5.4.0") -set(KF5_DEP_VERSION "5.10.0") +set(KF5_DEP_VERSION "5.13.0") # we need KMultiTabBar::appendButton(const QIcon &..., ...) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") diff --git a/kate/katemdi.h b/kate/katemdi.h --- a/kate/katemdi.h +++ b/kate/katemdi.h @@ -31,15 +31,15 @@ #include #include -#include #include #include #include #include #include class KActionMenu; class QAction; +class QPixmap; class KConfigBase; namespace KTextEditor @@ -174,7 +174,7 @@ */ bool persistent; - QPixmap icon; + QIcon icon; QString text; }; @@ -189,7 +189,7 @@ void setSplitter(QSplitter *sp); public: - ToolView *addWidget(const QPixmap &icon, const QString &text, ToolView *widget); + ToolView *addWidget(const QIcon &icon, const QString &text, ToolView *widget); bool removeWidget(ToolView *widget); bool showWidget(ToolView *widget); @@ -293,7 +293,7 @@ * @param text text to use in addition to icon * @return created toolview on success or 0 */ - ToolView *createToolView(KTextEditor::Plugin *plugin, const QString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const QPixmap &icon, const QString &text); + ToolView *createToolView(KTextEditor::Plugin *plugin, const QString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const QIcon &icon, const QString &text); /** * give you handle to toolview for the given name, 0 if no toolview around diff --git a/kate/katemdi.cpp b/kate/katemdi.cpp --- a/kate/katemdi.cpp +++ b/kate/katemdi.cpp @@ -305,7 +305,7 @@ m_ownSplit->hide(); } -ToolView *Sidebar::addWidget(const QPixmap &icon, const QString &text, ToolView *widget) +ToolView *Sidebar::addWidget(const QIcon &icon, const QString &text, ToolView *widget) { static int id = 0; @@ -792,7 +792,7 @@ return m_centralWidget; } -ToolView *MainWindow::createToolView(KTextEditor::Plugin *plugin, const QString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const QPixmap &icon, const QString &text) +ToolView *MainWindow::createToolView(KTextEditor::Plugin *plugin, const QString &identifier, KMultiTabBar::KMultiTabBarPosition pos, const QIcon &icon, const QString &text) { if (m_idToWidget[identifier]) { return 0;