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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp
This commit is contained in:
con
2011-03-28 11:40:45 +02:00
parent 4bc1b19da7 3a75137acd
commit 3de823ca62
72 changed files with 941 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -89,6 +89,7 @@ QString QmlProject::filesFileName() const
void QmlProject::parseProject(RefreshOptions options)
{
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
if (options & Files) {
if (options & ProjectFile)
delete m_projectItem.data();
@@ -103,10 +104,11 @@ void QmlProject::parseProject(RefreshOptions options)
connect(m_projectItem.data(), SIGNAL(qmlFilesChanged(QSet<QString>, QSet<QString>)),
this, SLOT(refreshFiles(QSet<QString>, QSet<QString>)));
} else {
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
messageManager->printToOutputPane(tr("Error while loading project file!"));
messageManager->printToOutputPane(tr("Error while loading project file %1.").arg(m_fileName));
messageManager->printToOutputPane(component->errorString(), true);
}
} else {
messageManager->printToOutputPane(tr("Error while loading `project file %1.").arg(m_fileName), true);
}
}
if (m_projectItem) {