diff --git a/applets/appmenu/plugin/appmenumodel.cpp b/applets/appmenu/plugin/appmenumodel.cpp
index 32091bdea..397838d75 100644
--- a/applets/appmenu/plugin/appmenumodel.cpp
+++ b/applets/appmenu/plugin/appmenumodel.cpp
@@ -299,7 +299,7 @@ QVariant AppMenuModel::data(const QModelIndex &index, int role) const
     if (role == MenuRole) { // TODO this should be Qt::DisplayRole
         return actions.at(row)->text();
     } else if (role == ActionRole) {
-        return qVariantFromValue((void *) actions.at(row));
+        return QVariant::fromValue((void *) actions.at(row));
     }
 
     return QVariant();
diff --git a/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels.cpp b/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels.cpp
index 32dd48cd5..8dba4cb14 100644
--- a/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels.cpp
+++ b/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels.cpp
@@ -96,7 +96,7 @@ void DefaultFilterModel::addFilter(const QString &caption, const Filter &filter,
 {
     QList<QStandardItem *> newRow;
     QStandardItem *item = new QStandardItem(caption);
-    item->setData(qVariantFromValue<Filter>(filter));
+    item->setData(QVariant::fromValue<Filter>(filter));
     if (!icon.isNull()) {
         item->setIcon(icon);
     }
diff --git a/dataengines/statusnotifieritem/statusnotifieritemjob.cpp b/dataengines/statusnotifieritem/statusnotifieritemjob.cpp
index 12eb518d9..d4047ee9e 100644
--- a/dataengines/statusnotifieritem/statusnotifieritemjob.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritemjob.cpp
@@ -57,6 +57,6 @@ void StatusNotifierItemJob::activateCallback(bool success)
 void StatusNotifierItemJob::contextMenuReady(QMenu *menu)
 {
     if (operationName() == QString::fromLatin1("ContextMenu")) {
-        setResult(qVariantFromValue((QObject*)menu));
+        setResult(QVariant::fromValue((QObject*)menu));
     }
 }
diff --git a/klipper/historymodel.cpp b/klipper/historymodel.cpp
index 80ab0f9dc..5ed372296 100644
--- a/klipper/historymodel.cpp
+++ b/klipper/historymodel.cpp
@@ -84,11 +84,11 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
     case Qt::DecorationRole:
         return item->image();
     case Qt::UserRole:
-        return qVariantFromValue<HistoryItemConstPtr>(qSharedPointerConstCast<const HistoryItem>(item));
+        return QVariant::fromValue<HistoryItemConstPtr>(qSharedPointerConstCast<const HistoryItem>(item));
     case Qt::UserRole+1:
         return item->uuid();
     case Qt::UserRole+2:
-        return qVariantFromValue<HistoryItemType>(type);
+        return QVariant::fromValue<HistoryItemType>(type);
     case Qt::UserRole+3:
         return item->uuid().toBase64();
     case Qt::UserRole+4:
diff --git a/klipper/klipper.h b/klipper/klipper.h
index 29663b689..2ae39a475 100644
--- a/klipper/klipper.h
+++ b/klipper/klipper.h
@@ -23,7 +23,7 @@
 
 #include "config-klipper.h"
 
-#include <QTime>
+#include <QElapsedTimer>
 #include <QTimer>
 #include <QClipboard>
 #include <QPointer>
@@ -161,7 +161,7 @@ private:
 
     QSharedPointer<HistoryItem> m_last;
 
-    QTime m_showTimer;
+    QElapsedTimer m_showTimer;
 
     History* m_history;
     KlipperPopup *m_popup;
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index 3ff9e2e23..86dd39e87 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -902,7 +902,7 @@ bool PanelView::event(QEvent *e)
             if (!containmentContainsPosition(we->pos())) {
                 auto we2 = new QWheelEvent(positionAdjustedForContainment(we->pos()),
                                 positionAdjustedForContainment(we->pos()) + position(),
-                                we->pixelDelta(), we->angleDelta(), we->delta(),
+                                we->pixelDelta(), we->angleDelta(), we->angleDelta().y(),
                                 we->orientation(), we->buttons(), we->modifiers(), we->phase());
 
                 QCoreApplication::postEvent(this, we2);