feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Turn WriteLogger assert into warning until we fixed causes

Browse Source 
We should enable it again after we don't know of any errors any more.
This commit is contained in:
Kai Koehne
2010-01-29 15:10:19 +01:00
parent 04161a4ced
commit 3c0b352bd1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/core/model/model.cpp
View File

@@ -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;
}