[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rkward/frameworks] rkward/plugin: Fix merge
From:       Thomas Friedrichsmeier <thomas.friedrichsmeier () ruhr-uni-bochum ! de>
Date:       2016-07-04 20:10:37
Message-ID: E1bKACT-0004DF-0t () code ! kde ! org
[Download RAW message or body]

Git commit 16e29b7832521d8a169aabbea0b7df2303bac573 by Thomas Friedrichsmeier.
Committed on 04/07/2016 at 20:10.
Pushed by tfry into branch 'frameworks'.

Fix merge

M  +2    -0    rkward/plugin/rkstandardcomponent.cpp

http://commits.kde.org/rkward/16e29b7832521d8a169aabbea0b7df2303bac573

diff --git a/rkward/plugin/rkstandardcomponent.cpp b/rkward/plugin/rkstandardcomponent.cpp
index 306a806..61a71bf 100644
--- a/rkward/plugin/rkstandardcomponent.cpp
+++ b/rkward/plugin/rkstandardcomponent.cpp
@@ -654,6 +654,7 @@ void RKComponentBuilder::buildElement (const QDomElement &element, XMLHelper &xm
 		} else if (e.tagName () == QLatin1String ("text")) {
 			widget = new RKText (e, component (), parent_widget);
 		} else if (e.tagName () == QLatin1String ("preview")) {
+			QWidget *pwidget = parent_widget;
 			if (!parent->isWizardish ()) {
 				RKStandardComponent *uicomp = parent->topmostStandardComponent ();
 				if (uicomp) {
@@ -663,6 +664,7 @@ void RKComponentBuilder::buildElement (const QDomElement &element, XMLHelper &xm
 			widget = new RKPreviewBox (e, component (), parent_widget);
 			parent_widget->layout ()->addWidget (widget);
 			parent_widget = pwidget;
+                        add_to_layout = false;
 		} else if (e.tagName () == QLatin1String ("saveobject")) {
 			widget = new RKPluginSaveObject (e, component (), parent_widget);
 		} else if (e.tagName () == QLatin1String ("embed")) {
[prev in list] [next in list] [prev in thread] [next in thread]