From b82311024dd109d8d3e1dcfe3d0d019ec635d76a Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Thu, 20 Aug 2015 14:47:02 +0200 Subject: Open Project: Don't show a error dialog for duplicated projects Instead, switch to edit mode, show sidebar, scroll to project, and show a tooltip next to the project. The tooltip is somewhat easy to miss, but this is a clear improvement in most cases. Change-Id: Icd27f76e7d434f33e731b6fd56473ff913986a89 Task-number: QTCREATORBUG-8422 Reviewed-by: Eike Ziller --- src/plugins/cpptools/cpptoolstestcase.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/cpptools/cpptoolstestcase.cpp') diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp index 8cd7953320..b54d6c4ace 100644 --- a/src/plugins/cpptools/cpptoolstestcase.cpp +++ b/src/plugins/cpptools/cpptoolstestcase.cpp @@ -286,13 +286,13 @@ ProjectOpenerAndCloser::~ProjectOpenerAndCloser() ProjectInfo ProjectOpenerAndCloser::open(const QString &projectFile, bool configureAsExampleProject) { - QString error; - Project *project = ProjectExplorerPlugin::openProject(projectFile, &error); - if (!error.isEmpty()) - qWarning() << error; - if (!project) + ProjectExplorerPlugin::OpenProjectResult result = ProjectExplorerPlugin::openProject(projectFile); + if (!result) { + qWarning() << result.errorMessage() << result.alreadyOpen(); return ProjectInfo(); + } + Project *project = result.project(); if (configureAsExampleProject) project->configureAsExampleProject(QStringList()); -- cgit v1.2.1