forked from qt-creator/qt-creator
Fix XML-based wizards
We returned bogus values for everything provided via combo boxes and
check boxes due to 3e8e82b2e3
.
Task-number: QTCREATORBUG-18670
Change-Id: I1b8e507ee089b99e6172b6382aceefc036da5d9e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
@@ -207,7 +207,7 @@ QWidget *CustomWizardFieldPage::registerComboBox(const QString &fieldName,
|
|||||||
break;
|
break;
|
||||||
combo->setCurrentIndex(currentIndex);
|
combo->setCurrentIndex(currentIndex);
|
||||||
} while (false);
|
} while (false);
|
||||||
registerField(fieldName, combo, "text", SIGNAL(text4Changed(QString)));
|
registerField(fieldName, combo, "indexText", SIGNAL(text4Changed(QString)));
|
||||||
// Connect to completeChanged() for derived classes that reimplement isComplete()
|
// Connect to completeChanged() for derived classes that reimplement isComplete()
|
||||||
connect(combo, &TextFieldComboBox::text4Changed, this, &QWizardPage::completeChanged);
|
connect(combo, &TextFieldComboBox::text4Changed, this, &QWizardPage::completeChanged);
|
||||||
return combo;
|
return combo;
|
||||||
@@ -271,7 +271,7 @@ QWidget *CustomWizardFieldPage::registerCheckBox(const QString &fieldName,
|
|||||||
const AttributeMapConstIt falseTextIt = field.controlAttributes.constFind(QLatin1String("falsevalue"));
|
const AttributeMapConstIt falseTextIt = field.controlAttributes.constFind(QLatin1String("falsevalue"));
|
||||||
if (falseTextIt != field.controlAttributes.constEnd()) // Also set empty texts
|
if (falseTextIt != field.controlAttributes.constEnd()) // Also set empty texts
|
||||||
checkBox->setFalseText(falseTextIt.value());
|
checkBox->setFalseText(falseTextIt.value());
|
||||||
registerField(fieldName, checkBox, "text", SIGNAL(textChanged(QString)));
|
registerField(fieldName, checkBox, "compareText", SIGNAL(textChanged(QString)));
|
||||||
// Connect to completeChanged() for derived classes that reimplement isComplete()
|
// Connect to completeChanged() for derived classes that reimplement isComplete()
|
||||||
connect(checkBox, &TextFieldCheckBox::textChanged, this, &QWizardPage::completeChanged);
|
connect(checkBox, &TextFieldCheckBox::textChanged, this, &QWizardPage::completeChanged);
|
||||||
return checkBox;
|
return checkBox;
|
||||||
|
Reference in New Issue
Block a user