Handle that QClipboard::mimeData() might return nullptr in Wayland
This commit is contained in:
parent
d7e7f9ecfa
commit
318542c658
|
@ -1254,7 +1254,8 @@ void MainWindow::showTableViewContextMenu()
|
|||
contextMenu.addSeparator();
|
||||
contextMenu.addAction(QIcon::fromTheme(QStringLiteral("edit-copy")), tr("Copy"), this, &MainWindow::copyFields);
|
||||
contextMenu.addAction(QIcon::fromTheme(QStringLiteral("edit-copy")), tr("Copy for 5 seconds"), this, &MainWindow::copyFieldsForXMilliSeconds);
|
||||
if (QApplication::clipboard()->mimeData()->hasText()) {
|
||||
const auto *const mimeData = QGuiApplication::clipboard()->mimeData();
|
||||
if (mimeData && mimeData->hasText()) {
|
||||
contextMenu.addAction(QIcon::fromTheme(QStringLiteral("edit-paste")), tr("Paste"), this, &MainWindow::insertFieldsFromClipboard);
|
||||
}
|
||||
// -> insert open URL
|
||||
|
|
|
@ -505,7 +505,7 @@ QMimeData *EntryModel::mimeData(const QModelIndexList &indexes) const
|
|||
if (types.isEmpty()) {
|
||||
return nullptr;
|
||||
}
|
||||
QMimeData *const data = new QMimeData();
|
||||
auto *const data = new QMimeData();
|
||||
QStringList plainTextParts;
|
||||
plainTextParts.reserve(indexes.size());
|
||||
QByteArray encoded;
|
||||
|
|
Loading…
Reference in New Issue