From d0159d7c7c0b2f59d1d3b5c6f2909be3f6a237c0 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 15 Apr 2009 16:22:55 +0200
Subject: [PATCH] Small tweaks to the cmake open project wizard.
Note: The use is now forced to run cmake. This is rather suboptimal, but
currently cancel doesn't do the correct thing so we prevent that.
---
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 7 +++++++
src/plugins/cmakeprojectmanager/cmakeproject.cpp | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index fcfef28f997..51d57b9e09b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -75,6 +75,8 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
setPage(CMakeRunPageId, new CMakeRunPage(this));
setStartId(startid);
+ setOption(QWizard::NoCancelButton);
+ setOption(QWizard::NoBackButtonOnStartPage);
}
CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory,
@@ -87,6 +89,8 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
addPage(new CMakeRunPage(this, buildDirectory, false));
foreach(const QString &buildDirectory, needToUpdate)
addPage(new CMakeRunPage(this, buildDirectory, true));
+ setOption(QWizard::NoCancelButton);
+ setOption(QWizard::NoBackButtonOnStartPage);
}
CMakeManager *CMakeOpenProjectWizard::cmakeManager() const
@@ -255,6 +259,9 @@ void CMakeRunPage::initWidgets()
m_output = new QPlainTextEdit(this);
m_output->setReadOnly(true);
+ QSizePolicy pl = m_output->sizePolicy();
+ pl.setVerticalStretch(1);
+ m_output->setSizePolicy(pl);
fl->addRow(m_output);
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index d1fe107412d..ffd333d23fa 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -512,7 +512,6 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
cleanMakeStep->setValue("clean", true);
} else {
// We have a user file, but we could still be missing the cbp file
- // TODO check that we have a cbp file and if not, open up a dialog ?
// or simply run createXml with the saved settings
QFileInfo sourceFileInfo(m_fileName);
QStringList needToCreate;
--
GitLab