Merge branch 'Plasma/5.12'

applets/notifications/plugin/notificationshelperplugin.cpp

@@ -21,20 +21,8 @@
 #include "thumbnailer.h"
 #include "draghelper.h"
 
-#include <QQmlNetworkAccessManagerFactory>
 #include <QUrl>
 #include <QQmlEngine>
-#include <QNetworkAccessManager>
-
-class NoAccessNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
-{
-public:
-    QNetworkAccessManager *create(QObject *parent) override {
-        QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
-        manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
-        return manager;
-    }
-};
 
 class UrlHelper : public QObject {
     Q_OBJECT
@@ -71,14 +59,4 @@ void NotificationsHelperPlugin::registerTypes(const char *uri)
     qmlRegisterSingletonType<DragHelper>(uri, 1, 0, "DragHelper", draghelper_singletontype_provider);
 }
 
-void NotificationsHelperPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.notifications"));
-
-    auto oldFactory = engine->networkAccessManagerFactory();
-    engine->setNetworkAccessManagerFactory(nullptr);
-    delete oldFactory;
-    engine->setNetworkAccessManagerFactory(new NoAccessNetworkAccessManagerFactory);
-}
-
 #include "notificationshelperplugin.moc"

applets/notifications/plugin/notificationshelperplugin.h

@@ -22,7 +22,6 @@
 
 #include <QQmlExtensionPlugin>
 
-class QQmlEngine;
 class NotificationsHelperPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -30,7 +29,6 @@ class NotificationsHelperPlugin : public QQmlExtensionPlugin
 
 public:
     void registerTypes(const char *uri) override;
-    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 
 };
 

libtaskmanager/taskgroupingproxymodel.cpp

@@ -722,12 +722,23 @@ QVariant TaskGroupingProxyModel::data(const QModelIndex &proxyIndex, int role) c
         } else if (role == AbstractTasksModel::IsVirtualDesktopChangeable) {
             return d->all(proxyIndex, AbstractTasksModel::IsVirtualDesktopChangeable);
         } else if (role == AbstractTasksModel::VirtualDesktop) {
-            // TODO: Nothing needs this for now and it would add complexity to
-            // make it a list; skip it until needed.
-            return QVariant();
+            // Returns the lowest virtual desktop id among all children of the
+            // group.
+            int virtualDesktop = INT_MAX;
+
+            for (int i = 0; i < rowCount(proxyIndex); ++i) {
+                const int childVirtualDesktop = proxyIndex.child(i, 0).data(AbstractTasksModel::VirtualDesktop).toInt();
+
+                if (childVirtualDesktop < virtualDesktop) {
+                    virtualDesktop = childVirtualDesktop;
+                }
+            }
+
+            return virtualDesktop;
         } else if (role == AbstractTasksModel::ScreenGeometry) {
             // TODO: Nothing needs this for now and it would add complexity to
-            // make it a list; skip it until needed.
+            // make it a list; skip it until needed. Once it is, do it similarly
+            // to the AbstractTasksModel::VirtualDesktop case.
             return QVariant();
         } else if (role == AbstractTasksModel::Activities) {
             QStringList activities;