diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-08 14:25:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-08 16:27:16 +0200 |
| commit | 32b035472ce2cce2949e110edc8d97693ee5f37e (patch) | |
| tree | f24dffc24eafc9079d221f6e9474072859577f10 /src/designer/src/components/formeditor/qdesigner_resource.cpp | |
| parent | 46a7db64042ae5dbba8902a097e79a6b71e1d01a (diff) | |
UiLoader: Map QLCDNumber::numDigits to QLCDNumber::digitCount'.
QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5.
Task-number: QTBUG-27462
Change-Id: I95e26e84cb589fd6fca74255d22bf806ea14d12e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/designer/src/components/formeditor/qdesigner_resource.cpp')
| -rw-r--r-- | src/designer/src/components/formeditor/qdesigner_resource.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index 6007ba0cd..0a6a00e51 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -938,7 +938,9 @@ void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &p const DomPropertyList::const_iterator cend = properties.constEnd(); for (DomPropertyList::const_iterator it = properties.constBegin(); it != cend; ++it) { const DomProperty *p = *it; - const QString propertyName = p->attributeName(); + QString propertyName = p->attributeName(); + if (propertyName == QLatin1String("numDigits") && o->inherits("QLCDNumber")) // Deprecated in Qt 4, removed in Qt 5. + propertyName = QLatin1String("digitCount"); const int index = sheet->indexOf(propertyName); QVariant v; if (!readDomEnumerationValue(p, sheet, index, v)) |