feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Correctly include KSyntaxHighlighting headers

Browse Source 
In external KSyntaxHighlighting, these headers now have paths like
/usr/include/KF5/KSyntaxHighlighting/KSyntaxHighlighting/AbstractHighlighter,
where /usr/include/KF5/KSyntaxHighlighting is passed to compiler as include
path.

Old headers which had only one KSyntaxHighlighting fragment in path were
removed in v5.94.0:
https://invent.kde.org/frameworks/syntax-highlighting/-/merge_requests/305

Adjust our vendored version to make the code work with both external and
vendored versions.

Change-Id: Iadcc668c3c705c563ae359301d227ee19eadca0f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Dmitry Shachnev
2022-05-18 18:03:22 +03:00
parent ef2ddeb00b
commit 4d9215e44d
16 changed files with 98 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/highlighter.cpp
View File

@@ -38,11 +38,11 @@
#include <utils/qtcassert.h>
#include <utils/stylehelper.h>
#include <DefinitionDownloader>
#include <FoldingRegion>
#include <Format>
#include <Repository>
#include <SyntaxHighlighter>
#include <KSyntaxHighlighting/DefinitionDownloader>
#include <KSyntaxHighlighting/FoldingRegion>
#include <KSyntaxHighlighting/Format>
#include <KSyntaxHighlighting/Repository>
#include <KSyntaxHighlighting/SyntaxHighlighter>
#include <QLoggingCategory>
#include <QMetaEnum>