summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/dialogs/qwizard.cpp13
-rw-r--r--tests/auto/qwizard/qwizard.pro2
-rw-r--r--tests/auto/qwizard/tst_qwizard.cpp11
-rw-r--r--tests/auto/qwizard/tst_qwizard_2.cpp208
4 files changed, 233 insertions, 1 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp
index 4ed20a4..dc91603 100644
--- a/src/gui/dialogs/qwizard.cpp
+++ b/src/gui/dialogs/qwizard.cpp
@@ -1703,16 +1703,29 @@ void QWizardPrivate::_q_updateButtonStates()
void QWizardPrivate::_q_handleFieldObjectDestroyed(QObject *object)
{
+ int destroyed_index = -1;
QVector<QWizardField>::iterator it = fields.begin();
while (it != fields.end()) {
const QWizardField &field = *it;
if (field.object == object) {
+ destroyed_index = fieldIndexMap.value(field.name, -1);
fieldIndexMap.remove(field.name);
it = fields.erase(it);
} else {
++it;
}
}
+ if (destroyed_index != -1) {
+ QMap<QString, int>::iterator it2 = fieldIndexMap.begin();
+ while (it2 != fieldIndexMap.end()) {
+ int index = it2.value();
+ if (index > destroyed_index) {
+ QString field_name = it2.key();
+ fieldIndexMap.insert(field_name, index-1);
+ }
+ ++it2;
+ }
+ }
}
void QWizardPrivate::setStyle(QStyle *style)
diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/qwizard/qwizard.pro
index 6c79886..dd69b49 100644
--- a/tests/auto/qwizard/qwizard.pro
+++ b/tests/auto/qwizard/qwizard.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
-SOURCES += tst_qwizard.cpp
+SOURCES += tst_qwizard.cpp tst_qwizard_2.cpp
#SOURCES += /home/jasmin/dev/solutions/widgets/qtwizard/src/qtwizard.cpp
#HEADERS += /home/jasmin/dev/solutions/widgets/qtwizard/src/qtwizard.h
#SOURCES += /home/jasplin/dev/research/qwizard/src/qwizard.cpp
diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp
index e5b94e9..88b3a3f 100644
--- a/tests/auto/qwizard/tst_qwizard.cpp
+++ b/tests/auto/qwizard/tst_qwizard.cpp
@@ -114,6 +114,7 @@ private slots:
void task177022_setFixedSize();
void task248107_backButton();
void task255350_fieldObjectDestroyed();
+ void taskQTBUG_25691_fieldObjectDestroyed2();
/*
Things that could be added:
@@ -2640,5 +2641,15 @@ void tst_QWizard::task255350_fieldObjectDestroyed()
delete page;
}
+// Global taskQTBUG_25691_fieldObjectDestroyed2 is defined in
+// tst_qwizard_2.cpp to avoid cluttering up this file with
+// the QWizardPage subclasses, etc. required to complete this
+// test.
+void taskQTBUG_25691_fieldObjectDestroyed2(void);
+void tst_QWizard::taskQTBUG_25691_fieldObjectDestroyed2()
+{
+ ::taskQTBUG_25691_fieldObjectDestroyed2();
+}
+
QTEST_MAIN(tst_QWizard)
#include "tst_qwizard.moc"
diff --git a/tests/auto/qwizard/tst_qwizard_2.cpp b/tests/auto/qwizard/tst_qwizard_2.cpp
new file mode 100644
index 0000000..a04c324
--- /dev/null
+++ b/tests/auto/qwizard/tst_qwizard_2.cpp
@@ -0,0 +1,208 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QComboBox>
+#include <QDebug>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QVBoxLayout>
+#include <QWizard>
+#include <QWizardPage>
+
+#include <QtTest/QtTest>
+
+class taskQTBUG_25691 : public QWizard
+{
+ Q_OBJECT
+public:
+ taskQTBUG_25691( QWidget * parent = 0 );
+
+ ~taskQTBUG_25691(void);
+};
+
+class taskQTBUG_25691Page1 : public QWizardPage
+{
+ Q_OBJECT
+public:
+ taskQTBUG_25691Page1( QWidget * parent = 0 );
+
+ ~taskQTBUG_25691Page1(void);
+};
+
+class taskQTBUG_25691Page2 : public QWizardPage
+{
+ Q_OBJECT
+public:
+ taskQTBUG_25691Page2( QWidget * parent = 0 );
+
+ virtual void initializePage(void);
+
+ ~taskQTBUG_25691Page2(void);
+
+private:
+ QVBoxLayout * layout;
+ QLineEdit * field0_value;
+ QLineEdit * field1_value;
+ QLineEdit * field2_value;
+};
+
+
+taskQTBUG_25691::taskQTBUG_25691( QWidget * parent )
+ : QWizard( parent )
+{
+ this->addPage( new taskQTBUG_25691Page1 );
+ this->addPage( new taskQTBUG_25691Page2 );
+ this->show();
+}
+
+taskQTBUG_25691::~taskQTBUG_25691(void)
+{
+}
+
+taskQTBUG_25691Page1::taskQTBUG_25691Page1( QWidget * parent )
+ : QWizardPage( parent )
+{
+ QComboBox * field0_needed = new QComboBox( this );
+ field0_needed->addItem( "No" );
+ field0_needed->addItem( "Yes" );
+ field0_needed->setCurrentIndex(0);
+ this->registerField( "field0_needed", field0_needed );
+
+ QComboBox * field1_needed = new QComboBox( this );
+ field1_needed->addItem( "No" );
+ field1_needed->addItem( "Yes" );
+ field1_needed->setCurrentIndex(0);
+ this->registerField( "field1_needed", field1_needed );
+
+ QComboBox * field2_needed = new QComboBox( this );
+ field2_needed->addItem( "No" );
+ field2_needed->addItem( "Yes" );
+ field2_needed->setCurrentIndex(0);
+ this->registerField( "field2_needed", field2_needed );
+
+ QVBoxLayout * layout = new QVBoxLayout;
+ layout->addWidget( field0_needed );
+ layout->addWidget( field1_needed );
+ layout->addWidget( field2_needed );
+ this->setLayout( layout );
+}
+
+taskQTBUG_25691Page1::~taskQTBUG_25691Page1(void)
+{
+}
+
+taskQTBUG_25691Page2::taskQTBUG_25691Page2( QWidget * parent )
+ : QWizardPage( parent )
+{
+ this->layout = new QVBoxLayout;
+ this->setLayout( this->layout );
+
+ this->field0_value = 0;
+ this->field1_value = 0;
+ this->field2_value = 0;
+}
+
+void taskQTBUG_25691Page2::initializePage(void)
+{
+ QWizard * wizard = this->wizard();
+ bool field0_needed = wizard->field( "field0_needed" ).toBool();
+ bool field1_needed = wizard->field( "field1_needed" ).toBool();
+ bool field2_needed = wizard->field( "field2_needed" ).toBool();
+
+ if ( field0_needed && this->field0_value == 0 ){
+ this->field0_value = new QLineEdit( "field0_default" );
+ this->registerField( "field0_value", this->field0_value );
+ this->layout->addWidget( this->field0_value );
+ } else if ( ! field0_needed && this->field0_value != 0 ){
+ this->layout->removeWidget( this->field0_value );
+ delete this->field0_value;
+ this->field0_value = 0;
+ }
+
+ if ( field1_needed && this->field1_value == 0 ){
+ this->field1_value = new QLineEdit( "field1_default" );
+ this->registerField( "field1_value", this->field1_value );
+ this->layout->addWidget( this->field1_value );
+ } else if ( ! field1_needed && this->field1_value != 0 ){
+ this->layout->removeWidget( this->field1_value );
+ delete this->field1_value;
+ this->field1_value = 0;
+ }
+
+ if ( field2_needed && this->field2_value == 0 ){
+ this->field2_value = new QLineEdit( "field2_default" );
+ this->registerField( "field2_value", this->field2_value );
+ this->layout->addWidget( this->field2_value );
+ } else if ( ! field2_needed && this->field2_value != 0 ){
+ this->layout->removeWidget( this->field2_value );
+ delete this->field2_value;
+ this->field2_value = 0;
+ }
+}
+
+taskQTBUG_25691Page2::~taskQTBUG_25691Page2(void)
+{
+}
+
+void taskQTBUG_25691_fieldObjectDestroyed2(void)
+{
+ QMainWindow mw;
+ taskQTBUG_25691 wb( &mw );
+
+ wb.setField( "field0_needed", true );
+ wb.setField( "field1_needed", true );
+ wb.setField( "field2_needed", true );
+ wb.next(); // Results in registration of all three field_Nvalue fields
+ wb.back(); // Back up to cancel need for field1_value
+ wb.setField( "field1_needed", false ); // cancel need for field1_value
+ wb.next(); // Results in destruction of field field1_value's widget
+ wb.next(); // Commit wizard's results
+
+ // Now collect the value from fields that was not destroyed.
+ QString field0_value = wb.field( "field0_value" ).toString();
+ QCOMPARE( field0_value, QString("field0_default") );
+
+ QString field2_value = wb.field( "field2_value" ).toString();
+ QCOMPARE( field2_value, QString("field2_default") );
+}
+
+#include "tst_qwizard_2.moc"
generated by cgit v0.12 at 2024-10-30 08:27:49 (GMT)