QAbstractItemView: don't access invalid indexes on copy-key
When pressing the copy key the view tried to access the model's data for the currentIndex() without checking whether the index is valid. This resulted in debug output to the console, and might break models that didn't check incoming indexes for validity (or asserted validity). Fix this by checking whether the currentIndex() is valid before reading the model's data for that index. Fixes: QTBUG-106569 Change-Id: Ide75fbdfdbd1451ab6d48f07b22136553c5b2468 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 3a0c33da3d913431391c5b7f4f0e93ea9d2221dc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
68249352af
commit
e3ceb846a2
@ -2366,11 +2366,12 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
|
||||
|
||||
#if !defined(QT_NO_CLIPBOARD) && !defined(QT_NO_SHORTCUT)
|
||||
if (event == QKeySequence::Copy) {
|
||||
QVariant variant;
|
||||
if (d->model)
|
||||
variant = d->model->data(currentIndex(), Qt::DisplayRole);
|
||||
if (variant.canConvert<QString>())
|
||||
QGuiApplication::clipboard()->setText(variant.toString());
|
||||
const QModelIndex index = currentIndex();
|
||||
if (index.isValid() && d->model) {
|
||||
const QVariant variant = d->model->data(index, Qt::DisplayRole);
|
||||
if (variant.canConvert<QString>())
|
||||
QGuiApplication::clipboard()->setText(variant.toString());
|
||||
}
|
||||
event->accept();
|
||||
}
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user