forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kde-apps/kate-addons: further no-pch fixes
Closes: https://bugs.gentoo.org/921935 Bug: https://bugs.gentoo.org/921720 Signed-off-by: Sam James <[email protected]>
- Loading branch information
1 parent
fefe284
commit ebfa971
Showing
1 changed file
with
44 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
https://bugs.gentoo.org/921720 | ||
https://invent.kde.org/utilities/kate/-/issues/116 | ||
https://invent.kde.org/utilities/kate/-/merge_requests/1387 | ||
https://invent.kde.org/utilities/kate/-/merge_requests/1388 | ||
|
||
From 83fcf7b4e7cc7bc54828192e9b89cfb286d864fd Mon Sep 17 00:00:00 2001 | ||
From: Aleix Pol <[email protected]> | ||
|
@@ -11,14 +12,6 @@ Ever since I last updated, I've started to get errors about includes | |
missing, so I've added them. | ||
|
||
(cherry picked from commit 73d090f7f7cb7cc013f31c7b572ca78a7fbeb5b8) | ||
--- | ||
addons/git-blame/kategitblameplugin.h | 1 + | ||
addons/project/git/gitstatus.h | 1 + | ||
apps/lib/ktexteditor_utils.h | 2 ++ | ||
3 files changed, 4 insertions(+) | ||
|
||
diff --git a/addons/git-blame/kategitblameplugin.h b/addons/git-blame/kategitblameplugin.h | ||
index 0a87f700e8..4c3d4a977f 100644 | ||
--- a/addons/git-blame/kategitblameplugin.h | ||
+++ b/addons/git-blame/kategitblameplugin.h | ||
@@ -20,6 +20,7 @@ | ||
|
@@ -29,8 +22,6 @@ index 0a87f700e8..4c3d4a977f 100644 | |
#include <QVariant> | ||
#include <QVector> | ||
|
||
diff --git a/addons/project/git/gitstatus.h b/addons/project/git/gitstatus.h | ||
index 7caad963eb..dcf01b66c9 100644 | ||
--- a/addons/project/git/gitstatus.h | ||
+++ b/addons/project/git/gitstatus.h | ||
@@ -5,6 +5,7 @@ | ||
|
@@ -41,8 +32,6 @@ index 7caad963eb..dcf01b66c9 100644 | |
#include <QString> | ||
#include <QVector> | ||
|
||
diff --git a/apps/lib/ktexteditor_utils.h b/apps/lib/ktexteditor_utils.h | ||
index ac3f218870..d9d4e6fdaa 100644 | ||
--- a/apps/lib/ktexteditor_utils.h | ||
+++ b/apps/lib/ktexteditor_utils.h | ||
@@ -7,6 +7,8 @@ | ||
|
@@ -56,3 +45,46 @@ index ac3f218870..d9d4e6fdaa 100644 | |
class QScrollBar; | ||
-- | ||
GitLab | ||
|
||
From bd8403ba1771d92586518868d0bfd42087b0db4d Mon Sep 17 00:00:00 2001 | ||
From: Sam James <[email protected]> | ||
Date: Fri, 12 Jan 2024 16:53:56 +0000 | ||
Subject: [PATCH] Add further missing includes | ||
|
||
Bug: https://bugs.gentoo.org/921935 | ||
Bug: https://invent.kde.org/utilities/kate/-/issues/116 | ||
Signed-off-by: Sam James <[email protected]> | ||
--- a/addons/project/gitstatusmodel.h | ||
+++ b/addons/project/gitstatusmodel.h | ||
@@ -5,6 +5,7 @@ | ||
*/ | ||
#pragma once | ||
|
||
+#include <QSet> | ||
#include <QAbstractItemModel> | ||
|
||
#include "git/gitstatus.h" | ||
--- a/addons/project/kateproject.h | ||
+++ b/addons/project/kateproject.h | ||
@@ -7,6 +7,8 @@ | ||
|
||
#pragma once | ||
|
||
+#include <QtGlobal> | ||
+ | ||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) | ||
#include <KTextEditor/ModificationInterface> | ||
#endif | ||
--- a/addons/project/kateprojectitem.h | ||
+++ b/addons/project/kateprojectitem.h | ||
@@ -7,6 +7,8 @@ | ||
|
||
#pragma once | ||
|
||
+#include <QtGlobal> | ||
+ | ||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | ||
#include <KTextEditor/Document> | ||
#else | ||
-- | ||
GitLab |