diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
tree | 3de2560e4259f22224f334be17618386860decc7 /src/widgets | |
parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 11 | ||||
-rw-r--r-- | src/widgets/doc/src/model-view-programming.qdoc | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 5 | ||||
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 5 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 6 |
5 files changed, 26 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index e51143cb7e..161dc65987 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) { @@ -1405,6 +1410,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 @@ -1437,7 +1446,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(); diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index 377ecf204e..d0d925e74a 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -2033,14 +2033,14 @@ \li Used to remove rows and the items of data they contain from all types of model. Implementations must call \l{QAbstractItemModel::beginRemoveRows()}{beginRemoveRows()} - \e before inserting new columns into any underlying data structures, and call + \e before rows are removed from any underlying data structures, and call \l{QAbstractItemModel::endRemoveRows()}{endRemoveRows()} \e{immediately afterwards}. \row \li \l{QAbstractItemModel::insertColumns()}{insertColumns()} \li Used to add new columns and items of data to table models and hierarchical models. Implementations must call \l{QAbstractItemModel::beginInsertColumns()}{beginInsertColumns()} \e before - rows are removed from any underlying data structures, and call + inserting new columns into any underlying data structures, and call \l{QAbstractItemModel::endInsertColumns()}{endInsertColumns()} \e{immediately afterwards}. \row \li \l{QAbstractItemModel::removeColumns()}{removeColumns()} diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index 665aa4b17a..a06283be02 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -153,7 +153,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO } setWindowModified_helper(); - setWinId(win->winId()); + WId id = win->winId(); + // See the QPlatformWindow::winId() documentation + Q_ASSERT(id != WId(0)); + setWinId(id); // Check children and create windows for them if necessary q_createNativeChildrenAndSetParent(q); diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 539cc70eb7..7f0813c303 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -1526,7 +1526,10 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, QRect aligned = alignedRect(header->direction, QFlag(header->iconAlignment), pixmap.size() / pixmap.devicePixelRatio(), rect); QRect inter = aligned.intersected(rect); - p->drawPixmap(inter.x(), inter.y(), pixmap, inter.x() - aligned.x(), inter.y() - aligned.y(), inter.width(), inter.height()); + p->drawPixmap(inter.x(), inter.y(), pixmap, + inter.x() - aligned.x(), inter.y() - aligned.y(), + aligned.width() * pixmap.devicePixelRatio(), + pixmap.height() * pixmap.devicePixelRatio()); if (header->direction == Qt::LeftToRight) rect.setLeft(rect.left() + pixw + 2); diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 0acd6052c8..b153d05885 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -582,6 +582,12 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid ret = 1; } } +#ifndef QT_NO_ACCESSIBILITY + if (!ret && opt && opt->type == QStyleOption::SO_MenuItem + && QStyleHelper::isInstanceOf(opt->styleObject, QAccessible::MenuItem) + && opt->styleObject->property("_q_showUnderlined").toBool()) + ret = 1; +#endif // QT_NO_ACCESSIBILITY break; } #endif |