From: tobtoht Date: Wed, 12 Nov 2025 15:28:50 +0000 (+0100) Subject: depends: qt: drop unused patches X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=42dc35dc52e729676a8c7364893d93d78bad347d;p=gamesguru%2Ffeather.git depends: qt: drop unused patches --- diff --git a/contrib/depends/patches/qt/disable-qmake.patch b/contrib/depends/patches/qt/disable-qmake.patch deleted file mode 100644 index b2fb46ca..00000000 --- a/contrib/depends/patches/qt/disable-qmake.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/cmake/QtBaseHelpers.cmake b/cmake/QtBaseHelpers.cmake -index 4b48f8f176..63e445e346 100644 ---- a/cmake/QtBaseHelpers.cmake -+++ b/cmake/QtBaseHelpers.cmake -@@ -212,7 +212,7 @@ macro(qt_internal_qtbase_build_repo) - endif() - - if(NOT QT_INTERNAL_BUILD_STANDALONE_PARTS) -- if(QT_FEATURE_settings) -+ if(QT_WILL_BUILD_TOOLS AND QT_FEATURE_settings) - add_subdirectory(qmake) - endif() - -diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt -index 9334ca72ab..801b4f7647 100644 ---- a/qmake/CMakeLists.txt -+++ b/qmake/CMakeLists.txt -@@ -112,19 +112,6 @@ qt_internal_add_tool(${target_name} - generators/win32/msvc_objectmodel.cpp # xml symbols clash with generators/win32/msbuild_objectmodel.cpp - library/qmakeparser.cpp # struct statics clashes with qmakeevaluator_p.h - ) -- --# When we don't build tools, we still want to be able to build the documentation. --# Add a fake interface library to make sure the documentation target is created. --# We use the direct name rather than ${target_name} to ensure the doc target keeps --# the original name even when cross-building. --if(NOT TARGET qmake) -- add_library(qmake INTERFACE) --endif() -- --qt_internal_add_docs(qmake -- doc/qmake.qdocconf --) -- - qt_internal_return_unless_building_tools() - - #### Keys ignored in scope 1:.:.:qmake.pro:: -@@ -154,3 +141,6 @@ set_target_properties(${target_name} PROPERTIES - qt_internal_apply_gc_binaries(${target_name} PRIVATE) - qt_skip_warnings_are_errors(${target_name}) - -+qt_internal_add_docs(${target_name} -+ doc/qmake.qdocconf -+) --- -2.46.2 - diff --git a/contrib/depends/patches/qt/no-resonance-audio.patch b/contrib/depends/patches/qt/no-resonance-audio.patch deleted file mode 100644 index d6cb225a..00000000 --- a/contrib/depends/patches/qt/no-resonance-audio.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,7 +3,6 @@ - - # Generated from src.pro. - --add_subdirectory(resonance-audio) - add_subdirectory(multimedia) - if(ANDROID) - add_subdirectory(android) --- -2.43.0 -