summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-02-17 13:37:00 +0100
committerKai Koehne <kai.koehne@nokia.com>2010-02-17 16:32:41 +0100
commitfb8357136efff51c9874c1a17a3889a650a3dada (patch)
tree738729d706cad2ab1ace8a1aa240981937b0df9b /src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
parent20ec30223c95c49b7512de13add5edb77453352c (diff)
downloadqt-creator-fb8357136efff51c9874c1a17a3889a650a3dada.tar.gz
Remove support for old .qmlproject file format
We used to fail back to the old format if the .qmlproject file was invalid. Anyhow, this lead to weird effects ... better disable it explicitly. That no warning is shown right now when loading an invalid qmlproject file is a bug in coreplugin.
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectmanager.cpp')
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectmanager.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
index 3d352876b9..2fc768f195 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
@@ -73,16 +73,14 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName)
foreach (ProjectExplorer::Project *pi, projectExplorer->session()->projects()) {
if (fileName == pi->file()->fileName()) {
- messageManager->printToOutputPane(tr("Failed opening project '%1': Project already open").arg(QDir::toNativeSeparators(fileName)));
- messageManager->displayStatusBarMessage(tr("Failed opening project"), 5000);
+ messageManager->printToOutputPanePopup(tr("Failed opening project '%1': Project already open")
+ .arg(QDir::toNativeSeparators(fileName)));
return 0;
}
}
if (fileInfo.isFile()) {
- QmlProject *project = new QmlProject(this, fileName);
- messageManager->displayStatusBarMessage(tr("Done opening project"), 5000);
- return project;
+ return new QmlProject(this, fileName);
}
return 0;