mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'release/20.12'
This commit is contained in:
commit
d74853ef85
|
@ -1091,7 +1091,7 @@ void DolphinMainWindow::handleUrl(const QUrl& url)
|
||||||
} else {
|
} else {
|
||||||
m_lastHandleUrlOpenJob = new KIO::OpenUrlJob(url);
|
m_lastHandleUrlOpenJob = new KIO::OpenUrlJob(url);
|
||||||
m_lastHandleUrlOpenJob->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
m_lastHandleUrlOpenJob->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
||||||
m_lastHandleUrlOpenJob->setRunExecutables(true);
|
m_lastHandleUrlOpenJob->setShowOpenOrExecuteDialog(true);
|
||||||
|
|
||||||
connect(m_lastHandleUrlOpenJob, &KIO::OpenUrlJob::mimeTypeFound, this,
|
connect(m_lastHandleUrlOpenJob, &KIO::OpenUrlJob::mimeTypeFound, this,
|
||||||
[this, url](const QString &mimetype) {
|
[this, url](const QString &mimetype) {
|
||||||
|
|
|
@ -638,7 +638,6 @@ void DolphinViewContainer::slotItemActivated(const KFileItem& item)
|
||||||
}
|
}
|
||||||
|
|
||||||
KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl());
|
KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl());
|
||||||
job->setRunExecutables(true);
|
|
||||||
job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
|
||||||
job->setShowOpenOrExecuteDialog(true);
|
job->setShowOpenOrExecuteDialog(true);
|
||||||
job->start();
|
job->start();
|
||||||
|
|
Loading…
Reference in a new issue