diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-05-18 11:38:35 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2011-05-26 13:48:39 +0200 |
| commit | 3111703828251da66563f16c1965291d1642a30f (patch) | |
| tree | 057b57937109baad7ef9a20e7a8746b09dec4359 | |
| parent | 7cb66c544b8ab467ca7e8b4a0c46a67d0f54e332 (diff) | |
| download | qt-creator-3111703828251da66563f16c1965291d1642a30f.tar.gz | |
Don't open files and help if someone chooses to cancel loading an example.
Task-Number: QTCREATORBUG-4414
Change-Id: I0272091d185fe6a9ac23022eb4efb723eb541494x
(cherry picked from commit 15ac4f0e21c63826a70650e68c433898306307d1)
Reviewed-on: http://codereview.qt.nokia.com/148
Reviewed-by: hjk <qthjk@ovi.com>
| -rw-r--r-- | src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index f6f9a86717..d2c9c0e80b 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -422,7 +422,6 @@ void GettingStartedWelcomePageWidget::slotOpenExample() } QString tryFile; - files << proFile; if (isQmlProject) { tryFile = proFileInfo.path() + '/' + "/main.qml"; if(!QFile::exists(tryFile)) @@ -436,10 +435,13 @@ void GettingStartedWelcomePageWidget::slotOpenExample() tryFile = proFileInfo.path() + "/main.cpp"; if(!QFile::exists(tryFile)) tryFile = proFileInfo.path() + '/' + proFileInfo.baseName() + ".cpp"; + files << tryFile; + } + if (ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFile)) { + Core::ICore::instance()->openFiles(files); + if (!helpFile.isEmpty()) + slotOpenContextHelpPage(helpFile); } - Core::ICore::instance()->openFiles(files, static_cast<Core::ICore::OpenFilesFlags>(Core::ICore::SwitchMode | Core::ICore::StopOnLoadFail)); - if (!tryFile.isEmpty() && Core::EditorManager::instance()->hasEditor(tryFile) && !helpFile.isEmpty()) - slotOpenContextHelpPage(helpFile); } void GettingStartedWelcomePageWidget::slotOpenHelpPage(const QString& url) |