diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deb95e6..e2a99ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: generator: Visual Studio 16 2019 cmake-arch: Win32 triplet: x86-windows-static-md - kf5: v5.106.0 + kf5: v5.116.0 qt: 5.15.2 kf5_cmake_args: "" qt-arch: win32_msvc2019 @@ -64,7 +64,7 @@ jobs: generator: Visual Studio 16 2019 cmake-arch: x64 triplet: x64-windows-static-md - kf5: v5.106.0 + kf5: v5.116.0 kf5_cmake_args: "" qt: 5.15.2 qt_arch: win64_msvc2019_64 @@ -72,9 +72,9 @@ jobs: generator: Visual Studio 16 2019 cmake-arch: x64 triplet: x64-windows-static-md - kf5: v5.106.0 + kf5: v6.6.0 kf5_cmake_args: "-DBUILD_WITH_QT6=ON" - qt: 6.5.1 + qt: 6.5.3 qt_arch: win64_msvc2019_64 steps: @@ -108,14 +108,14 @@ jobs: # Qt5 takes roughly a thousand years to build, so we download it from elsewhere... - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: arch: ${{ matrix.cfg.qt-arch }} version: ${{ matrix.cfg.qt }} 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: @@ -134,16 +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 }} - - uses: shogo82148/actions-setup-perl@v1 - - name: Build KF5SyntaxHighlighting + - name: Build KSyntaxHighlighting run: | cd syntax-highlighting mkdir build && cd build diff --git a/.gitmodules b/.gitmodules index ea589f6..0fb24df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "pycdc"] path = pycdc url = https://github.com/zrax/pycdc -[submodule "qtextpad"] - path = qtextpad - url = https://github.com/zrax/qtextpad diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d9de03..c8571f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.14) project(PlasmaShop) set(CMAKE_CXX_STANDARD 14) @@ -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() @@ -74,8 +74,13 @@ endif() add_definitions(-DPLASMASHOP_VERSION="${PlasmaShop_VERSION}") set(QTEXTPAD_WIDGET_ONLY ON) -add_subdirectory(qtextpad) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/qtextpad/lib") +include(FetchContent) +FetchContent_Declare(qtextpad + GIT_REPOSITORY https://github.com/zrax/qtextpad.git + GIT_TAG 1.11 +) +FetchContent_MakeAvailable(qtextpad) +include_directories("${qtextpad_SOURCE_DIR}/lib") add_subdirectory(src) diff --git a/qtextpad b/qtextpad deleted file mode 160000 index c8e2827..0000000 --- a/qtextpad +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c8e2827f9f424c1830c98ffcb340ff15f016cbc5