Merge branch 'Plasma/5.8' into Plasma/5.10

libtaskmanager/launchertasksmodel.cpp

@@ -107,7 +107,8 @@ void LauncherTasksModel::Private::init()
             q->dataChanged(q->index(0, 0),  q->index(launchersOrder.count() - 1, 0),
                 QVector<int>{Qt::DisplayRole, Qt::DecorationRole,
                 AbstractTasksModel::AppId, AbstractTasksModel::AppName,
-                AbstractTasksModel::GenericName, AbstractTasksModel::LauncherUrl});
+                AbstractTasksModel::GenericName, AbstractTasksModel::LauncherUrl,
+                AbstractTasksModel::LauncherUrlWithoutIcon});
         }
     );
 

libtaskmanager/tasksmodel.cpp

@@ -1446,7 +1446,7 @@ bool TasksModel::move(int row, int newPos)
         // When using launch-in-place sorting, launcher-backed window tasks act as launchers.
         } else if ((d->launchInPlace || !d->separateLaunchers)
             && idx.data(AbstractTasksModel::IsWindow).toBool()) {
-            const QUrl &launcherUrl = idx.data(AbstractTasksModel::LauncherUrl).toUrl();
+            const QUrl &launcherUrl = idx.data(AbstractTasksModel::LauncherUrlWithoutIcon).toUrl();
             const int launcherPos = launcherPosition(launcherUrl);
 
             if (launcherPos != -1) {