Merge branch 'master' into feature/bug_512677_trivial

# Conflicts:
#	addon/doxmlparser/doxmlparser/compound.py

Author: albert-github

.github/workflows/build_cmake.yml

@@ -108,7 +108,7 @@ jobs:
           }
     steps:
     - name: Checkout doxygen
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -368,7 +368,7 @@ jobs:
         endif()
 
     - name: Archive build artifacts
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: "${{ matrix.config.name }} build artifacts"
         path: build/bin/
@@ -417,14 +417,14 @@ jobs:
         endif()
 
     - name: Archive html documentation artifacts
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: "Html documentation artifacts"
         path: build/html/
       if: matrix.config.name == 'Ubuntu Latest GCC Release (Intel)'
 
     - name: Archive Latex documentation artifacts
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: "Latex documentation artifacts"
         path: build/latex/doxygen_manual.pdf
@@ -440,7 +440,7 @@ jobs:
         if (NOT result EQUAL 0)
           message(FATAL_ERROR "Building internal documentation failed")
         endif()
-      if: matrix.config.name == 'Ubuntu Latest GCC Release (Intel)'
+      if: ${{ github.ref_name == 'master' && github.event_name == 'push' && matrix.config.name == 'Ubuntu Latest GCC Release (Intel)' }}
 
     - name: Publish Internal documentation to Github pages
       uses: peaceiris/actions-gh-pages@v4
@@ -449,6 +449,6 @@ jobs:
          external_repository: doxygen/doxygen-docs
          publish_dir: build/doxygen_docs/html
          force_orphan: true
-      if: ${{ github.event_name == 'push' && matrix.config.name == 'Ubuntu Latest GCC Release (Intel)' }}
+      if: ${{ github.ref_name == 'master' && github.event_name == 'push' && matrix.config.name == 'Ubuntu Latest GCC Release (Intel)' }}
 
 

.github/workflows/coverity.yml

@@ -19,7 +19,7 @@ jobs:
     outputs:
       should_run: ${{ steps.should_run.outputs.should_run }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: print latest_commit
         run: echo ${{ github.sha }}
 
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout doxygen
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Download Coverity
         run: |

.github/workflows/docker_publish.yml

@@ -17,18 +17,18 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Log in to the Container registry
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 

.github/workflows/doxmlparser-publish.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python
       uses: actions/setup-python@v6
       with:

CMakeLists.txt

@@ -38,7 +38,7 @@ option(enable_tracing  "Enable tracing option in release builds [development]" O
 option(enable_lex_debug "Enable debugging info for lexical scanners in release builds [development]" OFF)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
-  if (CYGWIN OR MINGW)
+  if (CYGWIN OR MINGW OR NOT "${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)
   else()
     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
@@ -92,7 +92,7 @@ if(NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
     set(MACOS_VERSION_MIN 10.15) # needs std::filesystem
   endif()
   if(build_wizard AND CMAKE_SYSTEM MATCHES "Darwin")
-    set(MACOS_VERSION_MIN 11.0) # needs Qt
+    set(MACOS_VERSION_MIN 13.0) # needs Qt6
   endif()
 endif()
 

VERSION

@@ -1 +1 @@
-1.16.0
+1.17.0

addon/doxmlparser/doxmlparser/compound.py

@@ -986,6 +986,7 @@ class CompoundKind(str, Enum):
     TYPE='type'
     CONCEPT='concept'
     MODULE='module'
+    REQUIREMENT='requirement'
 
 
 class MemberKind(str, Enum):
@@ -1196,7 +1197,7 @@ def validate_CompoundKind(self, value):
                 self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
                 return False
             value = value
-            enumerations = ['class', 'struct', 'union', 'interface', 'protocol', 'category', 'exception', 'file', 'namespace', 'group', 'page', 'example', 'dir', 'type', 'concept', 'module']
+            enumerations = ['class', 'struct', 'union', 'interface', 'protocol', 'category', 'exception', 'file', 'namespace', 'group', 'page', 'example', 'dir', 'type', 'concept', 'module', 'requirement']
             if value not in enumerations:
                 lineno = self.gds_get_node_lineno_()
                 self.gds_collector_.add_message('Value "%(value)s"%(lineno)s does not match xsd enumeration restriction on CompoundKind' % {"value" : encode_str_2_3(value), "lineno": lineno} )

addon/doxmlparser/doxmlparser/index.py

@@ -138,9 +138,8 @@ static void findXRefSymbols(FileDef *fd)
                 fileToString(fd->absFilePath()),
                 lang,
                 FALSE,
-                FALSE,
-                QCString(),
-                fd);
+                CodeParserOptions()
+                .setFileDef(fd));
 }
 
 static void listSymbol(Definition *d)

addon/doxyapp/doxyapp.cpp

@@ -111,7 +111,7 @@ static void findXRefSymbols(FileDef *fd)
 
   // parse the source code
   intf->parseCode(parseList, QCString(), fileToString(fd->absFilePath()), lang,
-                  FALSE, FALSE, QCString(), fd);
+                  FALSE, CodeParserOptions().setFileDef(fd));
 }
 
 static bool ignoreStaticExternalCall(const MemberDef *context, const MemberDef *md) {