diff options
| author | Friedemann Kleint <[email protected]> | 2014-06-05 15:54:19 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2014-06-06 06:28:57 +0200 |
| commit | a6855cbf4046b8f5c7c4571631a722009828d578 (patch) | |
| tree | 22d60eea5c842167607a0f32a9eccfe3562463f5 | |
| parent | ab3603d2b5ed2cb6bc403643d82e97015449546b (diff) | |
QPlatformClipboard::emitChanged(): Do not emit signals when closing down.
Prevents a shutdown crash in the Qt Mfc migration solution.
Task-number: QTBUG-39317
Change-Id: I7f0aa40715baed57ff59682a477084347dfd45bc
Reviewed-by: Andy Shaw <[email protected]>
| -rw-r--r-- | src/gui/kernel/qplatformclipboard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformclipboard.cpp b/src/gui/kernel/qplatformclipboard.cpp index 5c250542600..d93268c9f24 100644 --- a/src/gui/kernel/qplatformclipboard.cpp +++ b/src/gui/kernel/qplatformclipboard.cpp @@ -123,7 +123,8 @@ bool QPlatformClipboard::ownsMode(QClipboard::Mode mode) const void QPlatformClipboard::emitChanged(QClipboard::Mode mode) { - QGuiApplication::clipboard()->emitChanged(mode); + if (!QGuiApplicationPrivate::is_app_closing) // QTBUG-39317, prevent emission when closing down. + QGuiApplication::clipboard()->emitChanged(mode); } QT_END_NAMESPACE |