Commit 13bb14dd authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

error message delivery threading fixes

the message manager is not thread-safe, so don't use it outside the main
thread.
parent 5120a83e
......@@ -962,15 +962,10 @@ void Qt4ProFileNode::setupReader()
bool Qt4ProFileNode::evaluate()
{
bool parserError = false;
if (!m_readerExact->readProFile(m_projectFilePath)) {
m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
if (!m_readerExact->readProFile(m_projectFilePath))
parserError = true;
}
if (!m_readerCumulative->readProFile(m_projectFilePath)) {
m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
if (!m_readerCumulative->readProFile(m_projectFilePath))
parserError = true;
}
return parserError;
}
......@@ -1012,8 +1007,10 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async)
if (m_readerCumulative)
m_project->destroyProFileReader(m_readerCumulative);
m_readerExact = m_readerCumulative = 0;
if (!parseResult) // Invalidate
if (!parseResult) {
m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
invalidate();
}
return;
}
......
......@@ -932,7 +932,8 @@ ProFileReader *Qt4Project::createProFileReader(Qt4ProFileNode *qt4ProFileNode)
ProFileReader *reader = new ProFileReader(m_proFileOption);
connect(reader, SIGNAL(errorFound(QString)),
this, SLOT(proFileParseError(QString)));
this, SLOT(proFileParseError(QString)),
Qt::QueuedConnection);
reader->setOutputDir(qt4ProFileNode->buildDir());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment