File 005-no_src_in_include_path-17.0.1.patch of Package qtcreator

diff -uprN qt-creator-opensource-src-17.0.1-orig/cmake/QtCreatorAPI.cmake qt-creator-opensource-src-17.0.1/cmake/QtCreatorAPI.cmake
--- qt-creator-opensource-src-17.0.1-orig/cmake/QtCreatorAPI.cmake	2025-08-26 03:28:18.000000000 +0200
+++ qt-creator-opensource-src-17.0.1/cmake/QtCreatorAPI.cmake	2025-09-03 15:42:01.710453990 +0200
@@ -261,8 +261,13 @@ function(add_qtc_library name)
 
   # everything is different with SOURCES_PREFIX
   if (NOT _arg_SOURCES_PREFIX)
+    if (QTC_MERGE_BINARY_DIR)
+      set(qtcreator_source_dir ${QtCreator_SOURCE_DIR}/src)
+    else()
+      set(qtcreator_source_dir ${PROJECT_SOURCE_DIR})
+    endif()
     get_filename_component(public_build_interface_dir "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
-    file(RELATIVE_PATH include_dir_relative_path ${PROJECT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/..")
+    file(RELATIVE_PATH include_dir_relative_path ${qtcreator_source_dir} "${CMAKE_CURRENT_SOURCE_DIR}/..")
     target_include_directories(${name}
       PRIVATE
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
@@ -629,8 +634,13 @@ function(add_qtc_plugin target_name)
     extend_qtc_target(${target_name} DEFINES ${EXPORT_SYMBOL})
   endif()
 
+  if (QTC_MERGE_BINARY_DIR)
+    set(qtcreator_source_dir ${QtCreator_SOURCE_DIR}/src)
+  else()
+    set(qtcreator_source_dir ${PROJECT_SOURCE_DIR})
+  endif()
   get_filename_component(public_build_interface_dir "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
-  file(RELATIVE_PATH include_dir_relative_path ${PROJECT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/..")
+  file(RELATIVE_PATH include_dir_relative_path ${qtcreator_source_dir} "${CMAKE_CURRENT_SOURCE_DIR}/..")
   target_include_directories(${target_name}
     PRIVATE
       "${CMAKE_CURRENT_BINARY_DIR}"
@@ -1280,7 +1290,11 @@ function(qtc_add_public_header header)
     set(header "${CMAKE_CURRENT_SOURCE_DIR}/${header}")
   endif()
 
-  qtc_source_dir(qtcreator_source_dir)
+  if (QTC_MERGE_BINARY_DIR)
+    set(qtcreator_source_dir ${QtCreator_SOURCE_DIR}/src)
+  else()
+    set(qtcreator_source_dir ${PROJECT_SOURCE_DIR})
+  endif()
   get_filename_component(source_dir ${header} DIRECTORY)
   file(RELATIVE_PATH include_dir_relative_path ${qtcreator_source_dir} ${source_dir})
 
diff -uprN qt-creator-opensource-src-17.0.1-orig/cmake/QtCreatorAPIInternal.cmake qt-creator-opensource-src-17.0.1/cmake/QtCreatorAPIInternal.cmake
--- qt-creator-opensource-src-17.0.1-orig/cmake/QtCreatorAPIInternal.cmake	2025-08-26 03:28:18.000000000 +0200
+++ qt-creator-opensource-src-17.0.1/cmake/QtCreatorAPIInternal.cmake	2025-09-03 15:42:01.710950125 +0200
@@ -252,7 +252,12 @@ function(set_public_includes target incl
     if (NOT IS_ABSOLUTE ${inc_dir})
       set(inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${inc_dir}")
     endif()
-    file(RELATIVE_PATH include_dir_relative_path ${PROJECT_SOURCE_DIR} ${inc_dir})
+    if (QTC_MERGE_BINARY_DIR)
+      set(qtcreator_source_dir ${QtCreator_SOURCE_DIR}/src)
+    else()
+      set(qtcreator_source_dir ${PROJECT_SOURCE_DIR})
+    endif()
+    file(RELATIVE_PATH include_dir_relative_path ${qtcreator_source_dir} ${inc_dir})
     target_include_directories(${target} ${system} PUBLIC
       $<BUILD_INTERFACE:${inc_dir}>
       $<INSTALL_INTERFACE:${_IDE_HEADER_INSTALL_PATH}/${include_dir_relative_path}>
diff -uprN qt-creator-opensource-src-17.0.1-orig/src/CMakeLists.txt qt-creator-opensource-src-17.0.1/src/CMakeLists.txt
--- qt-creator-opensource-src-17.0.1-orig/src/CMakeLists.txt	2025-08-26 03:28:20.000000000 +0200
+++ qt-creator-opensource-src-17.0.1/src/CMakeLists.txt	2025-09-03 15:42:01.711290470 +0200
@@ -1,7 +1,7 @@
 add_library(app_version INTERFACE)
 target_include_directories(app_version
   INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-  INTERFACE $<INSTALL_INTERFACE:${IDE_HEADER_INSTALL_PATH}/src>)
+  INTERFACE $<INSTALL_INTERFACE:${IDE_HEADER_INSTALL_PATH}>)
 install(TARGETS app_version EXPORT QtCreator)
 
 add_subdirectory(libs)