diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-04-22 13:50:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 18:57:45 +0200 |
| commit | f2fa65e4bfa09da6e857cd8c333eec5b1a87d318 (patch) | |
| tree | df9bf0f66ce42aae95a23e6cfa1267ad6172c221 /src/widgets | |
| parent | 1f6ab6a661a468dc6b5fb2dc24b05148e052c858 (diff) | |
Cocoa: Add setAlertState(), isAlertState(), beep() functions
Also, fix operator precedence error in QApplication::alert().
Change-Id: I140ccfba29638d24bc1c97f5f9a9611f66eb6b8f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qapplication_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index 6567ef5c2f..2761c84a8d 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -415,7 +415,7 @@ void QApplication::beep() void QApplication::alert(QWidget *widget, int duration) { if (widget) { - if (widget->window()->isActiveWindow()&& !widget->window()->windowState() & Qt::WindowMinimized) + if (widget->window()->isActiveWindow() && !(widget->window()->windowState() & Qt::WindowMinimized)) return; if (QWindow *window= QApplicationPrivate::windowForWidget(widget)) window->alert(duration); |