1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow unhandled custom uri-scheme opens to create QFileInfoEvent

Browse Source 
On macOS custom uri-scheme opens may generate a QFileOpenEvent that
the applications can handle. However when adding support also for
QDesktopServices::setUrlHandler(), this delivery mechanism stopped
from working because the event was unconditionally consumed /
delivered to only the url handler.

Instead change the logic such that if the url handler does not
handle it, allow a QFileInfoEvent to be created.

Amends: 664c7ffb212eb898ed03f7b19c883400fa027b6b

Fixes: QTBUG-134316
Change-Id: Ib1ed371ef531586bf549cf473b2a54748584d91d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 4755f52c08aac424b18ad94404ca8f7dabf8220d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0c7bea06c4871d25ebd334512cf1c38879b4b547)
This commit is contained in:
Juha Vuolle 2025-03-06 15:16:20 +02:00 committed by Qt Cherry-pick Bot
parent 578b4685c0
commit 11f7ab988e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -343,8 +343,8 @@ QT_USE_NAMESPACE
return;
QCocoaIntegration *cocoaIntegration = QCocoaIntegration::instance();
Q_ASSERT(cocoaIntegration);
cocoaIntegration->services()->handleUrl(QUrl(qurlString));
return;
if (cocoaIntegration->services()->handleUrl(QUrl(qurlString)))
return;
}
// The string we get from the requesting application might not necessarily meet