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

QmlProject: Adjust to MessageManager api change

Browse Source 
Change-Id: I4167939dea502b94efa61182c5a0aff56e9b3761
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Daniel Teske
2013-03-12 16:59:31 +01:00
parent a60e8fa4f7
commit 547a57e7eb
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,11 +194,11 @@ void QmlProject::parseProject(RefreshOptions options)
connect(m_projectItem.data(), SIGNAL(qmlFilesChanged(QSet<QString>,QSet<QString>)),
this, SLOT(refreshFiles(QSet<QString>,QSet<QString>)));
} else {
messageManager->printToOutputPane(tr("Error while loading project file %1.").arg(m_fileName));
messageManager->printToOutputPane(component->errorString(), true);
messageManager->printToOutputPane(tr("Error while loading project file %1.").arg(m_fileName), Core::MessageManager::NoModeSwitch);
messageManager->printToOutputPane(component->errorString(), Core::MessageManager::NoModeSwitch);
}
} else {
messageManager->printToOutputPane(tr("QML project: %1").arg(reader.errorString()), true);
messageManager->printToOutputPane(tr("QML project: %1").arg(reader.errorString()), Core::MessageManager::NoModeSwitch);
}
}
if (m_projectItem) {
@@ -212,8 +212,9 @@ void QmlProject::parseProject(RefreshOptions options)
QString errorMessage;
if (!reader.fetch(mainFilePath, &errorMessage)) {
messageManager->printToOutputPane(
tr("Warning while loading project file %1.").arg(m_fileName));
messageManager->printToOutputPane(errorMessage, true);
tr("Warning while loading project file %1.").arg(m_fileName),
Core::MessageManager::NoModeSwitch);
messageManager->printToOutputPane(errorMessage, Core::MessageManager::NoModeSwitch);
} else {
m_defaultImport = detectImport(QString::fromUtf8(reader.data()));
}