Skip to content

Commit

Permalink
Use KF6 with Qt6, to match what qtextpad expects
Browse files Browse the repository at this point in the history
  • Loading branch information
zrax committed Oct 9, 2024
1 parent d4edd29 commit a3d40aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
dir: ${{ github.workspace }}\qt
cache: true

# KF5SyntaxHighlighting and ecm release in lock-step
# KSyntaxHighlighting and ecm release in lock-step
- name: Checkout ECM
uses: actions/checkout@v4
with:
Expand All @@ -134,15 +134,15 @@ jobs:
cmake --build . --config Release -j 2
cmake --build . --config Release --target INSTALL
# Build KF5SyntaxHighlighting manually due to Qt dependency...
- name: Checkout KF5SyntaxHighlighting
# Build KSyntaxHighlighting manually due to Qt dependency...
- name: Checkout KSyntaxHighlighting
uses: actions/checkout@v4
with:
repository: KDE/syntax-highlighting
path: syntax-highlighting
ref: ${{ matrix.cfg.kf5 }}

- name: Build KF5SyntaxHighlighting
- name: Build KSyntaxHighlighting
run: |
cd syntax-highlighting
mkdir build && cd build
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ if(Qt5_FOUND AND NOT TARGET Qt::Core)
endforeach()
endif()

find_package(KF5SyntaxHighlighting REQUIRED)
if(KF5SyntaxHighlighting_VERSION VERSION_LESS "5.39.0")
message(WARNING "KF5SyntaxHighlighting version 5.39.0 or later is required \
in order to use custom highlighting rules. KF5SyntaxHighlighting version \
${KF5SyntaxHighlighting_VERSION} was detected, so these rules will be unavailable.")
find_package(KF${QT_VERSION_MAJOR}SyntaxHighlighting REQUIRED)
if(KF${QT_VERSION_MAJOR}SyntaxHighlighting_VERSION VERSION_LESS "5.39.0")
message(WARNING "KSyntaxHighlighting version 5.39.0 or later is required \
in order to use custom highlighting rules. KSyntaxHighlighting version \
${KFSyntaxHighlighting_VERSION} was detected, so these rules will be unavailable.")
add_definitions("-DKSYN_NO_CUSTOM_RULES_SUPPORT")
endif()

Expand Down

0 comments on commit a3d40aa

Please sign in to comment.