Commit 8c6e07dc authored by Laurent Montel's avatar Laurent Montel
Browse files

konversation depends against 5.91

parent 6b7efdf3
Pipeline #220953 passed with stage
in 3 minutes and 49 seconds
......@@ -30,11 +30,6 @@
#include "konversation_log.h"
#include "konversation_state.h"
#include <kwindowsystem_version.h>
#if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5, 91, 0)
#include "config-konversation.h"
#endif
#include <KIO/JobUiDelegate>
#include <KIO/OpenUrlJob>
#include <KConfig>
......@@ -1391,22 +1386,7 @@ void Application::handleOpen(const QList<QUrl>& urls)
void Application::activateForStartLikeCall()
{
mainWindow->show();
#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5, 91, 0)
KWindowSystem::updateStartupId(mainWindow->windowHandle());
#else
#if HAVE_X11
if (KWindowSystem::isPlatformX11()) {
KStartupInfo::setNewStartupId(mainWindow->windowHandle(), QX11Info::nextStartupId());
} else
#endif
if (KWindowSystem::isPlatformWayland()) {
const QString token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
if (!token.isEmpty()) {
KWindowSystem::setCurrentXdgActivationToken(token);
qunsetenv("XDG_ACTIVATION_TOKEN");
}
}
#endif
mainWindow->activateAndRaiseWindow();
}
......
......@@ -8,8 +8,6 @@
#include "application.h"
#include "config/preferences.h"
#include <knotifications_version.h>
namespace Konversation
{
......@@ -31,14 +29,7 @@ namespace Konversation
void TrayIcon::hideWindow()
{
#if KNOTIFICATIONS_VERSION >= QT_VERSION_CHECK(5, 91, 0)
hideAssociatedWidget();
#else
QWidget *window = associatedWidget();
if (window->isHidden())
return;
window->hide();
#endif
}
void TrayIcon::restoreWindow()
......
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