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

Merge remote branch 'origin/2.1'

Browse Source
This commit is contained in:
Friedemann Kleint
2010-10-27 11:05:31 +02:00
parent fe72f7c2f9 5a5ba58dc9
commit 54569c0624
40 changed files with 26000 additions and 7598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmljseditor/qmljsmodelmanager.cpp
View File

@@ -478,6 +478,7 @@ void ModelManager::onLoadPluginTypes(const QString &libraryPath, const QString &
return;
QProcess *process = new QProcess(this);
process->setEnvironment(info.qmlDumpEnvironment.toStringList());
connect(process, SIGNAL(finished(int)), SLOT(qmlPluginTypeDumpDone(int)));
connect(process, SIGNAL(error(QProcess::ProcessError)), SLOT(qmlPluginTypeDumpError(QProcess::ProcessError)));
QStringList args;