Skip to content

Commit

Permalink
Merge branch 'KDAB:2.1' into feelpp
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentchabannes authored Oct 26, 2024
2 parents de8f958 + eac68b6 commit d9669ff
Show file tree
Hide file tree
Showing 30 changed files with 901 additions and 435 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,5 @@ SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInCStyleCastParentheses: true
SpacesInParentheses: false
StatementAttributeLikeMacros: [emit,KDDW_CO_AWAIT]
...
5 changes: 3 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
- windows-2019
- macos-13
- macos-12
- macos-11

preset:
- name: ci-release-static-qt5
Expand Down Expand Up @@ -78,7 +77,7 @@ jobs:
#with:
#ref: '2.0' # schedule.cron do not allow branch setting

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
cache: 'pip'
cache-dependency-path: '.github/workflows/pip-requirements.txt'
Expand All @@ -101,7 +100,9 @@ jobs:
- name: Configure project
run: cmake -S . -B ./build-${{ matrix.preset.name }} --preset ${{ matrix.preset.name }}

# python on windows-2022 has a msvc problem
- name: Build Project ${{ matrix.preset.build_preset_arg }}
if: ${{ matrix.os != 'windows-2022' || matrix.preset.name != 'ci-python-qt6' }}
run: cmake --build ./build-${{ matrix.preset.name }} ${{ matrix.preset.build_preset_arg }}

- name: Run tests on Linux (offscreen)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
- uses: pre-commit/[email protected]
2 changes: 2 additions & 0 deletions .krazy
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ EXCLUDE style
SKIP /fwd_headers/
SKIP /flutter/generated/
SKIP Doxyfile.cmake
SKIP .markdownlint.json
SKIP book/searchindex.json

SKIP /src/3rdparty/|/examples/qtquick/CMakeFiles/
#skip CMake files
Expand Down
16 changes: 16 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"default": true,
"MD007": {
"indent": 2,
"start_indented": false
},
"MD013": {
"line_length": 100,
"tables": false,
"code_blocks": false
},
"MD029": {
"style": "ordered"
},
"MD033": false
}
1 change: 0 additions & 1 deletion .mdlrc

This file was deleted.

5 changes: 0 additions & 5 deletions .mdlrc.rb

This file was deleted.

22 changes: 10 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
ci:
skip: [pylint,clang-format]
skip: [pylint]
autoupdate_schedule: monthly

exclude: ^(cmake/ECM|cmake/KDAB/|src/3rdparty/|code.dev.code-workspace)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -21,22 +21,22 @@ repos:
- id: destroyed-symlinks
- id: check-executables-have-shebangs
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v17.0.6
rev: v19.1.1
hooks:
- id: clang-format
exclude: (.json)
- repo: https://github.com/PyCQA/pylint
rev: v3.1.0
rev: v3.3.1
hooks:
- id: pylint
exclude: ^(.cmake-format.py|conan/conanfile.py)
additional_dependencies: ["PySide2", "PySide6"]
- repo: https://github.com/hhatto/autopep8
rev: v2.1.0
rev: v2.3.1
hooks:
- id: autopep8
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
- repo: https://github.com/cheshirekow/cmake-format-precommit
Expand All @@ -46,21 +46,19 @@ repos:
exclude: (.py.cmake|Doxyfile.cmake|examples/flutter/)
- id: cmake-format
exclude: (.py.cmake|Doxyfile.cmake|examples/flutter/)
- repo: https://github.com/markdownlint/markdownlint
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.12.0
hooks:
- id: markdownlint
entry: mdl
language: ruby
- id: markdownlint-cli2
files: \.(md|mdown|markdown)$
exclude: (docs/book/)
- repo: https://github.com/fsfe/reuse-tool
rev: v3.0.1
rev: v4.0.3
hooks:
- id: reuse
args: [--suppress-deprecation]
- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.8.0-1
rev: v3.9.0-1
hooks:
- id: shfmt
- repo: https://github.com/shellcheck-py/shellcheck-py
Expand Down
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: GPL-2.0-only OR GPL-3.0-only

#misc config files
Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format .clang-format .clangd .clazy .clang-tidy .gitignore .mdlrc .mdlrc.rb .pep8 .pylintrc .editorconfig .shellcheckrc mkdocs.yml .github/workflows/mdbook.yml code.dev-*.code-workspace code.dev*.code-workspace vscode.code-workspace docs/api/Doxyfile.cmake distro/* *.yaml .github/workflows/pip-requirements.txt valgrind.sup
Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format .clang-format .clangd .clazy .clang-tidy .gitignore .markdownlint.json .pep8 .pylintrc .editorconfig .shellcheckrc mkdocs.yml .github/workflows/mdbook.yml code.dev-*.code-workspace code.dev*.code-workspace vscode.code-workspace docs/api/Doxyfile.cmake distro/* *.yaml .github/workflows/pip-requirements.txt valgrind.sup
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: BSD-3-Clause

Expand Down
58 changes: 58 additions & 0 deletions 3RDPARTY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# 3rdparty

Here we list which 3rdparty software used and possibly shipped by KDDW and their respective licenses.

## Runtime dependencies

### nlohmann JSON

JSON c++ library.<br>
[code](src/3rdparty/nlohmann/nlohmann/json.hpp)<br>
[MIT licensed](LICENSES/MIT.txt)

### KDBindings

Non-Qt signal/slot implementation.

[code](src/3rdparty/kdbindings/)<br>
[MIT licensed](LICENSES/MIT.txt)

### KDStlContainerAdaptor

Only used for a Flutter build.
Replacement for QVector.

[code](src/3rdparty/kdtoolbox/KDStlContainerAdaptor.h)<br>
[MIT licensed](LICENSES/MIT.txt)

## Build-time / CI tests 3rdparty

These dependencies are only used during build or other CI purposes like running tests.

### ECM

CMake build helpers.

[code](cmake/ECM/modules/)<br>
[BSD licensed](LICENSES/BSD-3-Clause.txt)

### doxygen-awesome.css

Template to generate documentation.

[code](docs/api/doxygen-awesome.css)<br>
[MIT licensed](LICENSES/MIT.txt)

### QCoro

co-routine Qt implementation, only used by Flutter unit-tests.

[code](src/3rdparty/qcoro/)<br>
[MIT licensed](LICENSES/MIT.txt)

### Flutter embedder and generated files

Only used for a flutter build and only during tests.

[code](tests/flutter_tests_embedder) and [code](examples/flutter)<br>
[BSD licensed](LICENSES/BSD-3-Clause.txt)
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ if(NOT KDDockWidgets_NO_SPDLOG)
endif()
endif()

# fmt 11 not supported yet, will get to it when it hits archlinux
if(spdlog_FOUND AND fmt_FOUND)
set(KDDockWidgets_HAS_SPDLOG TRUE)
else()
Expand Down
2 changes: 1 addition & 1 deletion Changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
* v2.1.1 (unreleased)
-
- Fix windows having transparency when drop indicators inhibited

* v2.1.0 (08 May 2024)
- Added standalone layouting example using Slint
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

![KDDockWidgetsLogo](https://github.com/KDAB/KDDockWidgets/blob/2.0/images/kddockwidgets.png?raw=true)

Our brand new [manual](https://docs.kdab.com/kddockwidgets-manual/2.0.0/)
Our brand new [manual](https://kdab.github.io/KDDockWidgets)
is now the docs entry point for everything related to `KDDockWidgets`.
This README only provides minimal information.

Expand Down
Loading

0 comments on commit d9669ff

Please sign in to comment.