From d822b5aef80823911870a915f17324c68eeeee4b Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Sun, 24 Apr 2016 02:47:20 +0200
Subject: Fix #1928. Disallow creation of KVS layout objects with QToolBar
 widgets as parent.

---
 src/modules/objects/KvsObject_layout.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/modules/objects/KvsObject_layout.cpp')

diff --git a/src/modules/objects/KvsObject_layout.cpp b/src/modules/objects/KvsObject_layout.cpp
index 6105066cc..18ede6b59 100644
--- a/src/modules/objects/KvsObject_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -140,6 +140,13 @@ bool KvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
 		pContext->warning(__tr2qs_ctx("The parent of a layout must be a widget!","objects"));
 		return false;
 	}
+
+	if(w->inherits("QToolBar"))
+	{
+		pContext->warning(__tr2qs_ctx("Qt does not support setting layouts on toolbar objects","objects"));
+		return false;
+	}
+
 	// If there already is a layout manager installed on this widget, QWidget won't let you install another.
 	if(w->layout()) delete w->layout();
 	setObject(new QGridLayout(w));
-- 
cgit v1.3.1-10-gc9f91