summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-20 11:18:17 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-03-20 11:28:14 +0100
commit69a5be7ef0475ba748ffbe50017c73e44a23a051 (patch)
treed29043898dba33596e3eb2ee51645b3330a87a88 /src/plugins
parent0359a82e6ef538316e550e7fa7c6dee8db72a225 (diff)
parentfcbbe7ff21a263f7fafb189caff4b662d4da7eda (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp
index 32a57473ad..fef5346eaf 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp
@@ -105,6 +105,7 @@ static QString alertSound(const QObject *object)
case Critical:
return QStringLiteral("SystemHand");
}
+ return QString();
}
return QStringLiteral("SystemAsterisk");
}