mirror of https://github.com/stenzek/duckstation
Deps: Revert Qt window-modal dialog disabling on Tahoe
It's not a problem for us, and the non-native dialogs look awful.pull/3634/head
parent
704cdef932
commit
95563345b1
@ -0,0 +1,19 @@
|
||||
--- a/src/tools/macdeployqt/shared/shared.cpp
|
||||
+++ b/src/tools/macdeployqt/shared/shared.cpp
|
||||
@@ -1122,14 +1122,8 @@
|
||||
addPlugins(QStringLiteral("networkinformation"));
|
||||
}
|
||||
|
||||
- // All image formats (svg if QtSvg is used)
|
||||
- const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix);
|
||||
- addPlugins(QStringLiteral("imageformats"), [usesSvg](const QString &lib) {
|
||||
- if (lib.contains(QStringLiteral("qsvg")) && !usesSvg)
|
||||
- return false;
|
||||
- return true;
|
||||
- });
|
||||
-
|
||||
+ // All image formats
|
||||
+ addPlugins(QStringLiteral("imageformats"));
|
||||
addPlugins(QStringLiteral("iconengines"));
|
||||
|
||||
// Platforminputcontext plugins if QtGui is in use
|
||||
@ -0,0 +1,14 @@
|
||||
--- a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm
|
||||
@@ -87,11 +87,6 @@ bool QCocoaMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality w
|
||||
return false;
|
||||
}
|
||||
|
||||
- // Tahoe has issues with window-modal alert buttons not responding to mouse
|
||||
- if (windowModality == Qt::WindowModal
|
||||
- && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSTahoe)
|
||||
- return false;
|
||||
-
|
||||
// And without options we don't know what to show
|
||||
if (!options())
|
||||
return false;
|
||||
Loading…
Reference in New Issue