Merge branch 'Plasma/5.17'

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(plasma-workspace)
+
 set(PROJECT_VERSION "5.17.80")
 set(PROJECT_VERSION_MAJOR 5)
 

components/containmentlayoutmanager/gridlayoutmanager.cpp

@@ -108,6 +108,8 @@ inline void maintainItemEdgeAlignment(ItemContainer *item, const QRectF &newRect
 
 void GridLayoutManager::layoutGeometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
+    m_grid.clear();
+    m_pointsForItem.clear();
     for (auto *item : layout()->childItems()) {
         // Stash the old config
         //m_parsedConfig[item->key()] = {item->x(), item->y(), item->width(), item->height(), item->rotation()};