Commit de8f489c authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Fix window activation on Wayland

parent db9796b2
Pipeline #185535 passed with stage
in 5 minutes and 38 seconds
......@@ -10,7 +10,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project(Konqueror VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.12.0")
set(KF5_MIN_VERSION "5.79.0")
set(KF5_MIN_VERSION "5.91.0")
set(KDE_COMPILERSETTINGS_LEVEL "5.82.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
......
......@@ -242,13 +242,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
KonqMainWindow *mainWindow = handleCommandLine(parser, workingDirectory, &ret);
if (mainWindow) {
// terminate startup notification and activate the mainwindow:
#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0)
mainWindow->setAttribute(Qt::WA_NativeWindow, true);
KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId());
#else
KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
#endif
KWindowSystem::forceActiveWindow(mainWindow->winId());
KWindowSystem::updateStartupId(mainWindow->windowHandle());
KWindowSystem::activateWindow(mainWindow->windowHandle());
}
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment