diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-28 08:56:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-28 08:58:49 +0200 |
| commit | be35b70ca1bf61d022f7dee9df4aaccbf715b25e (patch) | |
| tree | dd59ae3713b2bc516101f921491292a8b2c295e3 /src/widgets/dialogs/qmessagebox.cpp | |
| parent | cc54161abb977751b4499c559fc0f464b9e2399e (diff) | |
| parent | 572200989b224ad68e7b8ae4c0aecceb6ca871a2 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 4ec828ac83..995d279e13 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1392,7 +1392,7 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) #if !defined(QT_NO_TEXTEDIT) if (e == QKeySequence::Copy) { - if (d->detailsText->isVisible() && d->detailsText->copy()) { + if (d->detailsText && d->detailsText->isVisible() && d->detailsText->copy()) { e->setAccepted(true); return; } |