Update to 5.15.1

1 files changed, 10 insertions, 10 deletions

diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 07b4cac94422..e526054bfafb 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,4 +1,4 @@
-From eecb022d1c1bf16ad8c67d8a21b32a4952bf10f6 Mon Sep 17 00:00:00 2001
+From 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@@ -35,7 +35,7 @@ Change-Id: I75a9c91e9ab0dc06a941b576c28f87aef254669c
  2 files changed, 133 insertions(+), 202 deletions(-)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 309798a767..8b895ff544 100644
+index db18dbece6..5a5bc4d61d 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -52,6 +52,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
@@ -215,9 +215,9 @@ index 309798a767..8b895ff544 100644
 -!!ENDIF
 +!!ENDIF // !isEmpty(CMAKE_STATIC_TYPE)
  
-     # Add a versionless target, for compatibility with Qt6.
-     if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::$${CMAKE_MODULE_NAME})
-@@ -457,6 +483,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!IF !equals(TEMPLATE, aux)
+ !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+@@ -449,6 +475,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\")
  
@@ -274,7 +274,7 @@ index 309798a767..8b895ff544 100644
      set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
      foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
          if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
-@@ -475,6 +551,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -467,6 +543,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
              endif()
          endforeach()
@@ -284,7 +284,7 @@ index 309798a767..8b895ff544 100644
          set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
              INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
          )
-@@ -486,6 +565,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -478,6 +557,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}Private\"
              )
          endif()
@@ -292,7 +292,7 @@ index 309798a767..8b895ff544 100644
      endif()
  
  !!IF !equals(TEMPLATE, aux)
-@@ -555,9 +635,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -547,9 +627,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -306,7 +306,7 @@ index 309798a767..8b895ff544 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -568,76 +650,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -560,76 +642,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
 +endif()
 \ No newline at end of file
 -- 
-2.26.2
+2.28.0