Skip to content

feat: Knut depends against Qt6. We can use modern ksyntaxhighlighting lib #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Montel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Knut depends against Qt6. We can use modern ksyntaxhighlighting lib #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/extra-cmake-modules
Open in desktop
Submodule extra-cmake-modules updated 87 files
+0 −4 .gitlab-ci.yml
+1 −1 CMakeLists.txt
+1 −0 docs/module/ECMFeatureSummary.rst
+6 −11 docs/sphinx/ext/ecm.py
+3 −0 kde-modules/KDECMakeSettings.cmake
+1 −1 kde-modules/KDEClangFormat.cmake
+15 −1 kde-modules/KDECompilerSettings.cmake
+0 −3 kde-modules/KDEFrameworkCompilerSettings.cmake
+4 −1 kde-modules/KDEGitCommitHooks.cmake
+7 −1 kde-modules/KDEInstallDirsCommon.cmake
+10 −2 kde-modules/KDEPackageAppTemplates.cmake
+4 −0 kde-modules/clang-format.cmake
+22 −0 kde-modules/kde-git-commit-hooks/pre-commit.in
+33 −1 modules/ECMAddAndroidApk.cmake
+1 −1 modules/ECMAddAppIcon.cmake
+20 −8 modules/ECMAddTests.cmake
+10 −0 modules/ECMEnableSanitizers.cmake
+9 −5 modules/ECMFindQmlModule.cmake
+67 −19 modules/ECMGenerateHeaders.cmake
+2 −1 modules/ECMGeneratePkgConfigFile.cmake
+36 −1 modules/ECMGeneratePythonBindings.cmake
+57 −44 modules/ECMGenerateQDoc.cmake
+102 −30 modules/ECMQmlModule.cmake
+18 −1 modules/ECMQmlModule6.cmake
+37 −19 modules/ECMSetupQtPluginMacroNames.cmake
+15 −8 modules/ECMSetupVersion.cmake
+10 −5 modules/check-outbound-license.py
+22 −0 tests/CMakeLists.txt
+22 −1 tests/ECMAddTests/multi_tests/CMakeLists.txt
+8 −0 tests/ECMAddTests/multi_tests/test12.cpp
+8 −0 tests/ECMAddTests/multi_tests/test13.cpp
+9 −0 tests/ECMAddTests/multi_tests/test14.cpp
+9 −0 tests/ECMAddTests/multi_tests/test15.cpp
+18 −1 tests/ECMAddTests/single_tests/CMakeLists.txt
+8 −0 tests/ECMAddTests/single_tests/test8.cpp
+9 −0 tests/ECMAddTests/single_tests/test9.cpp
+1 −1 tests/ECMGenerateExportHeaderTest/consumer/CMakeLists.txt
+1 −1 tests/ECMGenerateExportHeaderTest/format_version/CMakeLists.txt
+1 −1 tests/ECMGenerateExportHeaderTest/library/CMakeLists.txt
+29 −1 tests/ECMGenerateHeadersTest/run_test.cmake.config
+16 −5 tests/ECMGeneratePkgConfigFile/CMakeLists.txt
+28 −0 tests/ECMGeneratePkgConfigFile/custom_defines/CMakeLists.txt
+29 −0 tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_description-param/CMakeLists.txt
+29 −0 tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_empty_description/CMakeLists.txt
+29 −0 tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_without_description/CMakeLists.txt
+24 −0 tests/ECMGeneratePkgConfigFile/no_optional_arguments/CMakeLists.txt
+0 −161 tests/ECMGeneratePkgConfigFile/run_test.cmake.config
+32 −0 tests/ECMGeneratePkgConfigFile/test-and-comparison-helpers.cmake
+26 −0 tests/ECMGeneratePkgConfigFile/with_an_URL_parameter/CMakeLists.txt
+29 −0 tests/ECMGeneratePkgConfigFile/with_public_and_private_dependencies/CMakeLists.txt
+1 −1 tests/ECMQmlModuleTest/qmldir_expected_depends_qt6
+1 −1 tests/ECMQmlModuleTest/qmldir_expected_full_qt6
+2 −0 tests/ECMQmlModuleTest/qmlmodule.cpp
+33 −31 tests/ECMSetupVersionTest/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_header/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_header_abspath/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_simple/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_simple_no_version_string_vars/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_soversion/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_version_file/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_explicit_version_file_abspath/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_header/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_header_abspath/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_header_prefix/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_simple/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_simple_no_version_string_vars/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_simple_prefix/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_soversion/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_soversion_prefix/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_version_file/CMakeLists.txt
+1 −1 tests/ECMSetupVersionTest/new_project_version_file_abspath/CMakeLists.txt
+1 −1 tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt
+16 −0 tests/KDEPackageAppTemplatesCrossTest/CMakeLists.txt
+16 −0 tests/KDEPackageAppTemplatesCrossTest/check.cmake.in
+0 −0 tests/KDEPackageAppTemplatesCrossTest/someFile
+13 −0 tests/KDEPackageAppTemplatesForcedTest/CMakeLists.txt
+37 −0 tests/KDEPackageAppTemplatesForcedTest/check.cmake.in
+10 −0 tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/CMakeLists.txt
+2 −0 tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/Messages.sh
+32 −0 tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/README
+ − tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/package/contents/images/pairs.svgz
+28 −0 tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/package/contents/ui/main.qml
+66 −0 tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/package/metadata.desktop
+74 −0 tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/qml-plasmoid.kdevtemplate
+ − tests/KDEPackageAppTemplatesForcedTest/qml-plasmoid/qml-plasmoid.png
+2 −1 tests/KDEPackageAppTemplatesTest/CMakeLists.txt
+25 −0 toolchain/ecm-version.gradle.in
2 changes: 1 addition & 1 deletion 3rdparty/ksyntaxhighlighting
Open in desktop
Submodule ksyntaxhighlighting updated 52 files
+2 −2 CMakeLists.txt
+136 −11 autotests/folding/highlight.haml.fold
+140 −69 autotests/folding/highlight.rb.fold
+77 −38 autotests/folding/test.gleam.fold
+63 −39 autotests/folding/test.odin.fold
+29 −0 autotests/folding/test.org.fold
+9 −0 autotests/folding/test.swift.fold
+141 −16 autotests/html/highlight.haml.dark.html
+141 −16 autotests/html/highlight.haml.html
+285 −214 autotests/html/highlight.rb.dark.html
+285 −214 autotests/html/highlight.rb.html
+48 −9 autotests/html/test.gleam.dark.html
+46 −7 autotests/html/test.gleam.html
+63 −39 autotests/html/test.odin.dark.html
+63 −39 autotests/html/test.odin.html
+29 −0 autotests/html/test.org.dark.html
+29 −0 autotests/html/test.org.html
+9 −0 autotests/html/test.swift.dark.html
+9 −0 autotests/html/test.swift.html
+125 −0 autotests/input/highlight.haml
+100 −29 autotests/input/highlight.rb
+45 −6 autotests/input/test.gleam
+63 −39 autotests/input/test.odin
+29 −0 autotests/input/test.org
+9 −0 autotests/input/test.swift
+154 −29 autotests/reference/highlight.haml.ref
+203 −132 autotests/reference/highlight.rb.ref
+48 −9 autotests/reference/test.gleam.ref
+63 −39 autotests/reference/test.odin.ref
+29 −0 autotests/reference/test.org.ref
+9 −0 autotests/reference/test.swift.ref
+24 −7 data/CMakeLists.txt
+1 −2 data/syntax/commonlisp.xml
+1 −2 data/syntax/earthfile.xml
+39 −47 data/syntax/gleam.xml
+1,330 −148 data/syntax/haml.xml
+14 −4 data/syntax/jira.xml
+3 −3 data/syntax/latex.xml
+9 −4 data/syntax/markdown.xml
+6 −4 data/syntax/odin.xml
+45 −40 data/syntax/orgmode.xml
+1 −1 data/syntax/rhtml.xml
+975 −503 data/syntax/ruby.xml
+26 −10 data/syntax/swift.xml
+3 −6 poqm/bg/syntaxhighlighting6_qt.po
+10 −14 poqm/el/syntaxhighlighting6_qt.po
+7 −7 poqm/fr/syntaxhighlighting6_qt.po
+10 −31 poqm/hu/syntaxhighlighting6_qt.po
+2 −2 poqm/nn/syntaxhighlighting6_qt.po
+23 −54 poqm/ru/syntaxhighlighting6_qt.po
+776 −273 src/indexer/katehighlightingindexer.cpp
+2 −2 utils/update-kate-editor-org.pl
Loading