From d93ae163c4bb443089d6107720356bd0ae39a6a1 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sat, 28 Jan 2017 16:55:28 +0100
Subject: Fix #2077

---
 src/modules/objects/KvsObject_layout.cpp | 6 ++++++
 1 file changed, 6 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 bca1d9132..2c57a60fd 100644
--- a/src/modules/objects/KvsObject_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -141,6 +141,12 @@ bool KvsObject_layout::init(KviKvsRunTimeContext * pContext, KviKvsVariantList *
 		pContext->warning(__tr2qs_ctx("Qt does not support setting layouts on toolbar objects", "objects"));
 		return false;
 	}
+
+	if(w->inherits("QDockWidget"))
+	{
+		pContext->warning(__tr2qs_ctx("Qt does not support setting layouts on dockwidget 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();
-- 
cgit v1.3.1-10-gc9f91