aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/syntax-highlighting
Commit message (Collapse)AuthorAgeFilesLines
* SyntaxHighlighting: Fix MSVC warningOrgad Shaneh2024-02-261-1/+1
| | | | | | | | | Implicit size_t -> int conversion. Upstream MR: https://invent.kde.org/frameworks/syntax-highlighting/-/merge_requests/601 Change-Id: I4208f0240c8a223fccf40add828499597e137c26 Reviewed-by: David Schulz <david.schulz@qt.io>
* TextEditor: update ksyntaxhighlighting engine to v5.249.0David Schulz2024-02-1696-2711/+5242
| | | | | | Task-number: QTCREATORBUG-22558 Change-Id: I0f75fd00828992df37f596148fac98069794248e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Make some more capturelists friendlier for C++20hjk2024-01-171-1/+1
| | | | | Change-Id: Ic00f75e1f59f5eb0430d24e4448a3bb7f8bfbd8d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* KSyntaxHighlighting: Remove highlighting files with unclear licenseEike Ziller2023-12-202-1444/+0
| | | | | | | | | | | | Makefiles are less relevant nowadays with CMake and Ninja, and the Python plugin does highlighting on its own. And users will still be prompted for downloading the highlighting files anyway. Change-Id: If80f1e8215375ed3985d9327c031f0c69fc15654 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io>
* KSyntaxHighlighting: Remove unused filesEike Ziller2023-12-207-5085/+0
| | | | | | | | | | The original patches for switching to KSyntaxHighlighting are no longer used. Remove empty readme file. Change-Id: I6b55b63bf19a04ef16f34b4764ddfc2800959b11 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Fix compiler warningsEike Ziller2023-05-021-1/+1
| | | | | | | | Change-Id: I9b0b4a60d1152142f62bf3f76885cf8019714623 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* SyntaxHighlighting: Fix qbs buildChristian Stenger2023-02-171-1/+1
| | | | | | | Broke with 30c768badb5337530c810113ab89cbb44edf714a. Change-Id: Id8b56247acc9d2eb447ca85d1c5c7c5bc77f70bb Reviewed-by: David Schulz <david.schulz@qt.io>
* Editor: update ksyntaxhighlighting engine to v5.103.0David Schulz2023-02-1761-3670/+3592
| | | | | | | Task-number: QTCREATORBUG-22558 Change-Id: Ifbb0fe4b02c07d3d6afb35d84644fe8e3542e8d2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMake build: Use version-less Qt targetsEike Ziller2023-01-052-2/+2
| | | | | | | | | Since we do not support Qt < 5.15 anymore, and as a first step for getting rid of our special FindQt5.cmake. Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Debugger: Also ship asm highlighting fileEike Ziller2023-01-041-0/+2352
| | | | | | | | | | | For highlighting disassembly views. Amends b41abc94bb82e300c5f646328d99a04a2339d208 Change-Id: Ifb5ddd50661459eb9deda9c2a419943777b1068c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Editor: update ksyntaxhighlighting engine to v5.95.0David Schulz2022-06-2927-72/+845
| | | | | | | Task-number: QTCREATORBUG-22558 Change-Id: I475730f342e7cc822fecdf7c9db64dc47baea83a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Correctly include KSyntaxHighlighting headersDmitry Shachnev2022-05-2413-58/+64
| | | | | | | | | | | | | | | | | | | 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>
* CMake: Fix configuration for the system KSyntaxHighlighting usageCristian Adam2022-05-041-1/+1
| | | | | | | | | | | extend_qtc_target() fails when a target doesn't exist, extend_qtc_library() does check if the target exists. Amends 88781a003ffd5f699f70b06d2d99325cf4e60c0f Change-Id: I76858f8a395d1b0f3735a8a74a36cf89703aa7f6 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Qt Creator Static build supportCristian Adam2022-04-291-2/+8
| | | | | | | | | | | | | | | | | | | This adds the build system feature that allows Qt Creator's libraries and plugins to be compiled statically. Fixes some symbol clashes when all plugins are linked into the same executable. Support for actually loading static plugins will be added in a separate commit. The feature is controlled by QTC_STATIC_BUILD which by default is OFF. Change-Id: I1fab7953c43e42dc75619e35660029ee067106df Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* KSyntaxHighlighting: Fix qbs buildChristian Stenger2022-02-111-0/+2
| | | | | | | Amends 37f8fcd79113c. Change-Id: I0734e26fc8015eb31d6cbbd86444179ee14c8304 Reviewed-by: David Schulz <david.schulz@qt.io>
* Editor: update ksyntaxhighlighting engine to v5.90.0David Schulz2022-02-1137-1386/+7230
| | | | | | | Task-number: QTCREATORBUG-22558 Change-Id: I7314c146a6de359ea8d60750d8a2c8e972b33fc9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove qmake build filesEike Ziller2022-01-205-83/+0
| | | | | | | | | | Removes qmake as a build system for building Qt Creator itself. Keep them for some tests that are not completely moved to CMake yet. Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: remove moved file from syntax-highlighting.proDavid Schulz2021-10-271-1/+0
| | | | | Change-Id: I30b5bb884274dc2526291826ce5cc823cc5e921d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix qHash-related size compatibility warnings by MSVCOrgad Shaneh2021-10-201-2/+2
| | | | | | Change-Id: I3b7981ce78b67db4b996f99682284a0b911d8cd7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Editor: Fix build for Qt < 5.15.2David Schulz2021-10-201-0/+4
| | | | | Change-Id: I06d1ec50159f3370fde05633de8e14f599140369 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Editor: update ksyntaxhighlighting engine to v5.87.0David Schulz2021-10-1978-811/+2613
| | | | | Change-Id: If9dab8b321799f0ce908c831e812c20301a714e1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* KSyntaxHighlighting: Streamline qbs buildChristian Kandeler2021-09-161-2/+44
| | | | | | | We don't have to build all the source files, and with Qt6, we can't. Change-Id: Ica16e90160cf4a90612f7bba28a1140d4e8c70a2 Reviewed-by: David Schulz <david.schulz@qt.io>
* qbs build: Prefer KSyntaxHighlighting from systemChristian Kandeler2021-05-111-1/+24
| | | | | | | Note that the system package will only be found with qbs >= 1.20. Change-Id: I361b774d6b35fdbd0386144d4e9812f02f7841e5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Use exportingProduct in Export itemsChristian Kandeler2021-05-111-2/+2
| | | | | | | | The use of product in Export items is deprecated and will be removed in one of the next qbs versions. Change-Id: I2644a69012db4a4b4842066784913f4160d3d80a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Highlighter: adjust Qt6 compile fixes to upstream changesDavid Schulz2021-03-2412-17/+21
| | | | | Change-Id: I0d7962a4a52cbdf5645f30f86bca5457a4c061f9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.14' into 4.15Eike Ziller2021-03-221-0/+396
|\ | | | | | | Change-Id: I72ac4dab24021f0272a30400cc801387f0dcb558
| * Highlighter: readd autoconf highlighterDavid Schulz2021-03-181-0/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | It isn't in the public repository of the syntax files, but it still seems to work. Amends: 14834e6b0a4e7c1272ec3a1838b0634dd66e72ea Fixes: QTCREATORBUG-25391 Change-Id: I23819bdc79c5b4fab92b1150ed102f742a204e89 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Highlighter: add new comment rulesDavid Schulz2021-03-182-0/+587
| | | | | | | | | | Change-Id: I2f98c1374cab90f068db318051af2ea4be57cbae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Highlighting: Fix compile before Qt5.15Christian Stenger2021-03-171-1/+1
| | | | | | | | | | | | | | Amends d4c4f8c00753abaa37517. Change-Id: I8f6c16b373500ab2fedbc4d43ccfb503565eccbd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Editor: Qt6 compile fixes for KSyntaxHighlighterDavid Schulz2021-03-1717-36/+39
| | | | | | | | | | Change-Id: I5f00cb8e948762da8f855059dcf90b7857d57482 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Highlighting: update KSyntaxHighlighting to v5.80.0David Schulz2021-03-1775-2739/+7601
| | | | | | | | | | | | Task-number: QTCREATORBUG-22558 Change-Id: I57d782397f88842edbd08b1008b2d88706c6ab52 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.14'Eike Ziller2021-02-221-0/+3
|\| | | | | | | Change-Id: Ib9512b4fc5e17b04ca4be79fc315e79a52d06497
| * CMake build: Add .pri files to development packageEike Ziller2021-02-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds at least partial, transitional support for building 3rdparty plugins with qmake against Qt Creator built with CMake. This might still miss some other .pri files that follow their own naming conventions. Fixes: QTCREATORBUG-24055 Fixes: QTCREATORBUG-25334 Change-Id: I83cc547da938976c2ec12a21a17f286b937147f7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | qbs build: Remove code for creating deployment packagesChristian Kandeler2021-02-171-26/+0
| | | | | | | | | | | | | | | | Not a use case anymore, and if it were, we'd do it using built-in capabilities. Change-Id: I4c588ad7fb282530880210cb4c5795677074b1e0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.14'Eike Ziller2021-01-041-9/+11
|\| | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I5b8d93f2f08b62626c3f3447728c64d198b601ff
| * cmake build: Don't install highlighting files when using system libEike Ziller2020-12-181-9/+11
| | | | | | | | | | | | | | | | | | When using the system provided KF5SyntaxHighlighting library, the highlighting files are taken from the system too. Fixes: QTCREATORBUG-25143 Change-Id: Iac0b9734bc96e1f72d1494622081da7e279e5554 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.14'Eike Ziller2020-12-141-0/+7
|\| | | | | | | Change-Id: I842a7c7358fd0ff6d85c151806e440043914e09a
| * cmake build: Add option to build against system SyntaxHighlighting libEike Ziller2020-12-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Enable/disable our own KSyntaxHighlighting by default depending on the availability of KF5SyntaxHighlighting. If that is available, it still is possible to turn the building and using of our own KSyntaxHighlighting copy on by enabling BUILD_LIBRARY_KSYNTAXHIGHLIGHTING. Fixes: QTCREATORBUG-25076 Change-Id: I3545fc12d87572d7eb6f5977994b081ff7ea3880 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Don't access static functions/fields via instanceAlessandro Portale2020-11-271-1/+1
|/ | | | | | | | | | | | Courtesy of readability-static-accessed-through-instance Amends: b2a766a79ac778febff87f0def34cf6d3f4f93e3 Round #2: This time done with Qt Creator's Analyzer, which found other occurences than run-clang-tidy.py Change-Id: I479e280c7abcf2d24baccbb0af69ae4bda05198e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* KSyntaxHighlighter: Fix compile with Qt5.14Christian Stenger2020-11-161-1/+1
| | | | | Change-Id: I9a98717ba99357940ab8b42c025bea4ecfa42102 Reviewed-by: David Schulz <david.schulz@qt.io>
* Editor: Qt6 compile fixes for KSyntaxHighlighterDavid Schulz2020-11-1617-36/+39
| | | | | Change-Id: I65487a3ccb93efeec3be3971f876d317b5a6bfc6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Editor: update KSyntaxHighlighting to v5.75.0David Schulz2020-11-1694-3319/+4563
| | | | | Change-Id: Ibef1526fccf52920d0d557c8b8f3a52bec5550f8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: Add missing file to dev packageEike Ziller2020-10-291-1/+4
| | | | | | | | | | | | The public header "textdocumentlayout.h" includes "State" from KSyntaxHighlighting, so we need to export that. Since it doesn't have the ".h" extension, it doesn't get exported automatically either. Add a generic function for adding such special public header files. Fixes: QTCREATORBUG-24413 Change-Id: I841e6d601df7e925f48eedcc2a28d6b43c00350e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Doc: List all licenses applied to KSyntaxHighlightingLeena Miettinen2020-10-274-0/+1623
| | | | | | | | | Added license files. Fixes: QTCREATORBUG-24618 Change-Id: Ibeeb69f9f072d2c11e0c7a3839bd760986807dd8 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove unneeded QStringList forward declarationsEike Ziller2020-09-293-9/+0
| | | | | | | | | Fixes build issue with Qt6, for which QStringList is now a QList<QString>. Task-number: QTCREATORBUG-24098 Change-Id: I0c81aa5bae413b836dbedea0bb6117b46f6f24c2 Reviewed-by: hjk <hjk@qt.io>
* CMake build system: Propagate less target dependencies and includesAlessandro Portale2020-09-211-1/+2
| | | | | | | ...and thereby have less include paths per compile unit. Change-Id: I70de8db12d881ea827595ca0cacaea13b5c0f3bd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix crash in KSyntaxHighlightingEike Ziller2020-09-091-5/+6
| | | | | | | | | | | In contrast to QString::midRef/QStringRef::mid, QStringView::mid crashes/asserts when being passed values that exceed the string length. Amends 6b9cad8b05c2a71880fa587c0dda0a8b16797e96 Task-number: QTCREATORBUG-24098 Change-Id: Icc53a5dc3bcbc881e614140d4084bdea2bfab59d Reviewed-by: David Schulz <david.schulz@qt.io>
* KSyntaxHighlighter: Fix compileChristian Stenger2020-09-081-1/+1
| | | | | | | Amends 6b9cad8b05c. Change-Id: I9f254e254edfadeb4fa1e41c20514463477d7184 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* KSyntaxHighlighting: Use QStringView instead of QStringRefEike Ziller2020-09-0810-31/+38
| | | | | | | | | | QStringRef will be removed for Qt6, or moved into a Qt 5 compatibility library, but the QString API will be removed. Switch to QStringView instead. Task-number: QTCREATORBUG-24098 Change-Id: Ia3cab3de24ba36b5db64e1eff18d92e66ccd3d94 Reviewed-by: hjk <hjk@qt.io>
* KSyntaxHighlighter: Replace usage of deprecated enum valueEike Ziller2020-09-081-1/+2
| | | | | | | | | QNetworkRequest::FollowRedirectsAttribute is removed in Qt6, use the semantic equivalent. Task-number: QTCREATORBUG-24098 Change-Id: I73822f87bd8b6464e9b5d0ba871fec322cbdd8b9 Reviewed-by: hjk <hjk@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 08:16:51 +0000