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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
This commit is contained in:
con
2010-06-18 16:54:37 +02:00
parent 443d5d3dc6 13bb14dd3c
commit 458a25efa9
36 changed files with 430 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -939,7 +939,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());