diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-14 01:11:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-14 01:11:43 +0200 |
commit | 415f65fbff0ebbdeab09bbed8c06872352e3f5ca (patch) | |
tree | 82f6d0d85df04e9c145543ec1be4d3fa58a919ca /src/widgets/dialogs | |
parent | 62fbf3ca6fc2d1736c6f5d5456f66ae1cfe94be8 (diff) | |
parent | f7837e28b5f83d116fa43d0401b7188ce27fc346 (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 5bcda9bf25..f545d1ffd2 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -143,6 +143,11 @@ public: #endif } + void selectAll() + { + textEdit->selectAll(); + } + private slots: void textCopyAvailable(bool available) { @@ -1410,6 +1415,10 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) e->setAccepted(true); return; } + } else if (e == QKeySequence::SelectAll && d->detailsText && d->detailsText->isVisible()) { + d->detailsText->selectAll(); + e->setAccepted(true); + return; } #endif // !QT_NO_TEXTEDIT @@ -1442,7 +1451,7 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) #endif // !QT_NO_CLIPBOARD && !QT_NO_SHORTCUT #ifndef QT_NO_SHORTCUT - if (!(e->modifiers() & Qt::AltModifier)) { + if (!(e->modifiers() & (Qt::AltModifier | Qt::ControlModifier | Qt::MetaModifier))) { int key = e->key() & ~Qt::MODIFIER_MASK; if (key) { const QList<QAbstractButton *> buttons = d->buttonBox->buttons(); |