Skip to content

Upstream merge conflict #1

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.

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

Draft
wants to merge 4,859 commits into
base: master
Choose a base branch
from
Draft

Upstream merge conflict #1

wants to merge 4,859 commits into from

Conversation

shahmoradi
Copy link
Member

Upstream merge conflict with the fork by @shahmoradi

doxygen and others added 30 commits March 10, 2025 19:51
issue #9437,#11179 Add docs about markdown page exceptions
…ammy

Update docker base os from focal to jammy
…rcell/install-qt-action-5

Bump jdpurcell/install-qt-action from 4 to 5
…match

Warning when more `#if` than `#endif` statements
Adding some options to the `\cite` command to make it more flexible so that not only a reference number can be show.
Bumps [docker/login-action](https://github.com/docker/login-action) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@9780b0c...74a5d14)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
… name

Only search for the extension in the filename, not the complete name.
…er/login-action-3.4.0

Bump docker/login-action from 3.3.0 to 3.4.0
Fixing regressions due to:
```
Commit: 0bcc24b [0bcc24b]

Commit Date: Sunday, March 23, 2025 3:19:59 PM

Cleanup unused HTML/CSS elements
```
Fixing some incorrect tags in HTML output
To speed up loading, especially for the graphical class hierarchy page
gruenich and others added 30 commits June 6, 2025 19:24
Many changes are triggered by Cppcheck to have variables more
local and const. Further, do not split declaration and
initializiation.
…mp_2

Handling of TIMESTAMP in html footer and header
Found by Cppcheck (redundantAssignment).
Found by Cppcheck (constVariablePointer)
Move declaration of variable into for loop header.
Move declaration closer to variable use.
Unify declaration and initialization.

Many found by Cppcheck (variableScope).
Vanilla from tarball, no Doxygen-specific modifications
necessary anymore.
Catching end tags for `<thead>`, <tfoot> and `<tbody>` as well so they won't throw a warning:w
Catching tags for `<thead>`, `<tfoot>` and `<tbody>` as well so they won't throw a warning
Used wrong variable, giving problems with doxygen documentation generation
Fix potential (but very unlikely) memory leak as found by coverity.
Use in lexers always `{CMD}` instead of `[\\@]` or `[@\\]`
Fix XML generation for trailing return types with `delete` and `default`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.