23rd
70 linhas
2.2 KiB
Diff
70 linhas
2.2 KiB
Diff
From 982e3ecbcf9a874bd5f82433f514f3175a84eeb1 Mon Sep 17 00:00:00 2001
|
|
From: 23rd <23rd@vivaldi.net>
|
|
Date: Wed, 1 Apr 2026 09:06:36 +0300
|
|
Subject: [PATCH] 1
|
|
|
|
---
|
|
external/qt/CMakeLists.txt | 22 ++++++++++++++++++++--
|
|
options_mac.cmake | 11 +++++++++++
|
|
2 files changed, 31 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
|
|
index 577b67b..9845f55 100644
|
|
--- a/external/qt/CMakeLists.txt
|
|
+++ b/external/qt/CMakeLists.txt
|
|
@@ -234,12 +234,30 @@ elseif (APPLE)
|
|
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}BundledFreetype
|
|
plugins/platforms/${qt_lib_prefix}qcocoa
|
|
plugins/tls/${qt_lib_prefix}qsecuretransportbackend
|
|
- plugins/networkinformation/${qt_lib_prefix}qscnetworkreachability
|
|
)
|
|
+ if (QT_VERSION VERSION_GREATER_EQUAL "6.11")
|
|
+ list(APPEND qt_libs
|
|
+ plugins/networkinformation/${qt_lib_prefix}qapplenetworkinformation
|
|
+ )
|
|
+ else()
|
|
+ list(APPEND qt_libs
|
|
+ plugins/networkinformation/${qt_lib_prefix}qscnetworkreachability
|
|
+ )
|
|
+ endif()
|
|
list(APPEND qt_libs_list
|
|
$<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QCocoaIntegrationPlugin_init>
|
|
$<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QSecureTransportBackendPlugin_init>
|
|
- $<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QSCNetworkReachabilityNetworkInformationPlugin_init>
|
|
+ )
|
|
+ if (QT_VERSION VERSION_GREATER_EQUAL "6.11")
|
|
+ list(APPEND qt_libs_list
|
|
+ $<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QAppleNetworkInformationPlugin_init>
|
|
+ )
|
|
+ else()
|
|
+ list(APPEND qt_libs_list
|
|
+ $<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QSCNetworkReachabilityNetworkInformationPlugin_init>
|
|
+ )
|
|
+ endif()
|
|
+ list(APPEND qt_libs_list
|
|
$<TARGET_OBJECTS:Qt${QT_VERSION_MAJOR}::QCocoaIntegrationPlugin_resources_1>
|
|
)
|
|
foreach (lib ${qt_libs})
|
|
diff --git a/options_mac.cmake b/options_mac.cmake
|
|
index 59494d8..73960ad 100644
|
|
--- a/options_mac.cmake
|
|
+++ b/options_mac.cmake
|
|
@@ -80,3 +80,14 @@ INTERFACE
|
|
LocalAuthentication
|
|
Vision
|
|
)
|
|
+
|
|
+target_link_frameworks_weak(common_options
|
|
+INTERFACE
|
|
+ Network
|
|
+ UniformTypeIdentifiers
|
|
+)
|
|
+
|
|
+target_link_libraries(common_options
|
|
+INTERFACE
|
|
+ resolv
|
|
+)
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|