Merge remote-tracking branch 'origin/release/19.12'

This commit is contained in:
David Faure 2019-11-10 14:19:57 +01:00
commit 4c81a78bae

View file

@ -235,7 +235,8 @@ void DolphinMainWindow::openFiles(const QStringList& files, bool splitView)
void DolphinMainWindow::activateWindow() void DolphinMainWindow::activateWindow()
{ {
KStartupInfo::setNewStartupId(window(), KStartupInfo::startupId()); window()->setAttribute(Qt::WA_NativeWindow, true);
KStartupInfo::setNewStartupId(window()->windowHandle(), KStartupInfo::startupId());
KWindowSystem::activateWindow(window()->effectiveWinId()); KWindowSystem::activateWindow(window()->effectiveWinId());
} }