From 3c0b352bd17722a6b7b25c3b91c80589891262da Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 29 Jan 2010 15:10:19 +0100
Subject: [PATCH] Turn WriteLogger assert into warning until we fixed causes
We should enable it again after we don't know of any errors any more.
---
src/plugins/qmldesigner/core/model/model.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/core/model/model.cpp b/src/plugins/qmldesigner/core/model/model.cpp
index 229b03ac133..e6564d10688 100644
--- a/src/plugins/qmldesigner/core/model/model.cpp
+++ b/src/plugins/qmldesigner/core/model/model.cpp
@@ -895,7 +895,10 @@ WriteLocker::WriteLocker(ModelPrivate *model)
: m_model(model)
{
Q_ASSERT(model);
- Q_ASSERT(!m_model->m_writeLock);
+ if (m_model->m_writeLock)
+ qWarning() << "QmlDesigner: Misbehaving view calls back to model!!!";
+ // FIXME: Enable it again
+ // Q_ASSERT(!m_model->m_writeLock);
model->m_writeLock = true;
}
@@ -903,13 +906,19 @@ WriteLocker::WriteLocker(Model *model)
: m_model(model->m_d)
{
Q_ASSERT(model->m_d);
- Q_ASSERT(!m_model->m_writeLock);
+ if (m_model->m_writeLock)
+ qWarning() << "QmlDesigner: Misbehaving view calls back to model!!!";
+ // FIXME: Enable it again
+ // Q_ASSERT(!m_model->m_writeLock);
m_model->m_writeLock = true;
}
WriteLocker::~WriteLocker()
{
- Q_ASSERT(m_model->m_writeLock);
+ if (!m_model->m_writeLock)
+ qWarning() << "QmlDesigner: Misbehaving view calls back to model!!!";
+ // FIXME: Enable it again
+ // Q_ASSERT(m_model->m_writeLock);
m_model->m_writeLock = false;
}
--
GitLab