diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2013-10-25 17:17:28 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-15 05:20:47 (GMT) |
| commit | 8ebaa4ce5a683837c2121351c0114d2b10574f48 (patch) | |
| tree | 7c87042ecfbe8d361a6a45a49c75708f00efd29c | |
| parent | 9a6b005b53c7ee0f55230be5d1f21d8cc0eeb51d (diff) | |
| download | Qt-8ebaa4ce5a683837c2121351c0114d2b10574f48.zip Qt-8ebaa4ce5a683837c2121351c0114d2b10574f48.tar.gz Qt-8ebaa4ce5a683837c2121351c0114d2b10574f48.tar.bz2 | |
QWizard: provoke 'enum value not handled in switch' warnings in object_name_for_button
This is strictly speaking a behavior change, since we're no longer returning
something for Stretch and NoButton, but - guessing here - that shouldn't matter.
Yet, better safe than sorry, thus submitted as a separate patch.
Change-Id: I20cb084147f8c9257ce37d1e87ea38febabec28d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/269590516d89a35ea3121366f7d4bf43b0d391ca)
| -rw-r--r-- | src/gui/dialogs/qwizard.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index 20c9edc..53e2765 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -1359,10 +1359,22 @@ static QString object_name_for_button(QWizard::WizardButton which) return QLatin1String("qt_wizard_") + QLatin1String("finish"); case QWizard::CancelButton: return QLatin1String("qt_wizard_") + QLatin1String("cancel"); - default: + case QWizard::BackButton: + case QWizard::NextButton: + case QWizard::HelpButton: + case QWizard::CustomButton1: + case QWizard::CustomButton2: + case QWizard::CustomButton3: // Make navigation buttons detectable as passive interactor in designer return QLatin1String("__qt__passive_wizardbutton") + QString::number(which); + case QWizard::Stretch: + case QWizard::NoButton: + //case QWizard::NStandardButtons: + //case QWizard::NButtons: + ; } + //Q_UNREACHABLE(); + return QString(); } bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const |