Commit 473c9a38 authored by David Edmundson's avatar David Edmundson

Drop pre Qt5.9 changes

Test Plan: Compiles

Reviewers: anthonyfieroni

Reviewed By: anthonyfieroni

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8339
parent 0145ec9a
......@@ -30,7 +30,6 @@
#include <QQuickWindow>
#include <QScreen>
#include <QDBusConnection>
#include <QVersionNumber>
#include <QTimer>
AppMenuApplet::AppMenuApplet(QObject *parent, const QVariantList &data)
......@@ -179,14 +178,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
}
};
//pre 5.8.0 QQuickWindow code is "item->grabMouse(); sendEvent(item, mouseEvent)"
//post 5.8.0 QQuickWindow code is sendEvent(item, mouseEvent); item->grabMouse()
if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) {
QTimer::singleShot(0, ctx, ungrabMouseHack);
}
else {
ungrabMouseHack();
}
QTimer::singleShot(0, ctx, ungrabMouseHack);
//end workaround
const auto &geo = ctx->window()->screen()->availableVirtualGeometry();
......
......@@ -29,7 +29,6 @@
#include <QQuickItem>
#include <QQuickWindow>
#include <QTimer>
#include <QVersionNumber>
#include <KFileItemActions>
#include <KFileItemListProperties>
......@@ -170,14 +169,7 @@ void Thumbnailer::showContextMenu(int x, int y, const QString &path, QQuickItem
}
};
//pre 5.8.0 QQuickWindow code is "item->grabMouse(); sendEvent(item, mouseEvent)"
//post 5.8.0 QQuickWindow code is sendEvent(item, mouseEvent); item->grabMouse()
if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) {
QTimer::singleShot(0, ctx, ungrabMouseHack);
}
else {
ungrabMouseHack();
}
QTimer::singleShot(0, ctx, ungrabMouseHack);
//end workaround
......
......@@ -22,7 +22,6 @@
#include <QDebug>
#include <QProcess>
#include <QVersionNumber>
#include <QTimer>
#include <QDBusConnection>
......@@ -179,14 +178,7 @@ void SystemTray::showPlasmoidMenu(QQuickItem *appletInterface, int x, int y)
}
};
//pre 5.8.0 QQuickWindow code is "item->grabMouse(); sendEvent(item, mouseEvent)"
//post 5.8.0 QQuickWindow code is sendEvent(item, mouseEvent); item->grabMouse()
if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) {
QTimer::singleShot(0, appletInterface, ungrabMouseHack);
}
else {
ungrabMouseHack();
}
QTimer::singleShot(0, appletInterface, ungrabMouseHack);
//end workaround
......
Markdown is supported
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