diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2022-05-18 18:03:22 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2022-05-24 11:28:08 +0000 |
| commit | 4d9215e44d70c10be2c183592e8280c4d7292a83 (patch) | |
| tree | 8326e4a6fde6be4f5e2893eba669b986cfd3d769 /src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs | |
| parent | ef2ddeb00bf1fb1ff392ad82c8d45ec94b133b38 (diff) | |
Correctly include KSyntaxHighlighting headers
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>
Diffstat (limited to 'src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs')
| -rw-r--r-- | src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs index 82b5ea8f75..5dbb334b74 100644 --- a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs +++ b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs @@ -28,6 +28,7 @@ Project { cpp.defines: base.concat("KF5SyntaxHighlighting_EXPORTS") cpp.includePaths: [ product.sourceDirectory + "/src/lib/", + product.sourceDirectory + "/autogenerated/include/", product.sourceDirectory + "/autogenerated/src/lib/", product.sourceDirectory + "/autogenerated/" ] @@ -122,6 +123,7 @@ Project { Depends { name: "cpp" } cpp.includePaths: [ exportingProduct.sourceDirectory + "/src/lib/", + exportingProduct.sourceDirectory + "/autogenerated/include/", exportingProduct.sourceDirectory + "/autogenerated/src/lib/", ] } |