From 6dc7be59759f71270214751dc604f12cf5248408 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 3 Dec 2008 16:34:33 +0100
Subject: [PATCH] Fixes: - Cancel button and default button for wizards on
Mac
---
src/libs/utils/filewizarddialog.cpp | 2 ++
src/plugins/coreplugin/basefilewizard.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp
index 8608fed73ec..8441cdb8638 100644
--- a/src/libs/utils/filewizarddialog.cpp
+++ b/src/libs/utils/filewizarddialog.cpp
@@ -44,6 +44,8 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
m_filePage(new FileWizardPage)
{
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+ setOption(QWizard::NoCancelButton, false);
+ setOption(QWizard::NoDefaultButton, false);
setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png")));
addPage(m_filePage);
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index f72353743b8..58030ba20c9 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -509,6 +509,8 @@ QPixmap BaseFileWizard::watermark()
void BaseFileWizard::setupWizard(QWizard *w)
{
w->setPixmap(QWizard::WatermarkPixmap, watermark());
+ w->setOption(QWizard::NoCancelButton, false);
+ w->setOption(QWizard::NoDefaultButton, false);
}
bool BaseFileWizard::postGenerateFiles(const GeneratedFiles &l, QString *errorMessage)
--
GitLab