SVN commit 879360 by aseigo:

if we're given a layout, don't create another layout for it to live in


 M  +8 -4      tabbar.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasma/widgets/tabbar.cpp #879359:879360
@@ -215,10 +215,14 @@
     QGraphicsWidget *page = new QGraphicsWidget(this);
     page->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     if (content) {
-        QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, page);
-        layout->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-        page->setLayout(layout);
-        layout->addItem(content);
+        if (content->isLayout()) {
+            page->setLayout(static_cast<QGraphicsLayout *>(content));
+        } else {
+            QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, page);
+            layout->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+            layout->addItem(content);
+            page->setLayout(layout);
+        }
     } else {
         page->setPreferredSize(0, 0);
     }