From: Kevin Krammer <kevin.krammer@kdab.com>
Date: Fri, 14 Jun 2013 13:05:54 +0000 (+0200)
Subject: Fix assert in declarative root context handling
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d69f4911a8c0922bf7f7ae64838b8cfb28d5f8f4;p=web%2Fkonrad%2FDeclarativeWidgets.git

Fix assert in declarative root context handling
---

diff --git a/lib/declarativedeclarativeviewextension.cpp b/lib/declarativedeclarativeviewextension.cpp
index 435c7af..6cdd25f 100644
--- a/lib/declarativedeclarativeviewextension.cpp
+++ b/lib/declarativedeclarativeviewextension.cpp
@@ -60,7 +60,7 @@ void DeclarativeDeclarativeViewExtension::setDeclarativeRootContext(QObject *con
     return;
 
   // we can only set a different wrapper, not replace the view's root context
-  Q_ASSERT(declarativeContext->context() == m_rootContext->context());
+  Q_ASSERT(m_rootContext.isNull() || declarativeContext->context() == m_rootContext->context());
 
   m_rootContext = QPointer<DeclarativeContext>(declarativeContext);
   emit declarativeRootContextChanged();