From 803dbf529392b9c329d15f7ebdef7c407629a274 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 8 Oct 2012 14:22:27 +0200 Subject: uic: Map QLCDNumber::numDigits to QLCDNumber::digitCount. QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5. Task-number: QTBUG-27462 Change-Id: I3772a884f31aeea70121cccd429ac996b2ecbccd Reviewed-by: Jarek Kobus --- src/tools/uic/cpp/cppwriteinitialization.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 0843158d21..38d6782e83 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1179,7 +1179,7 @@ void WriteInitialization::writeProperties(const QString &varName, const DomProperty *p = lst.at(i); if (!checkProperty(m_option.inputFile, p)) continue; - const QString propertyName = p->attributeName(); + QString propertyName = p->attributeName(); QString propertyValue; // special case for the property `geometry': Do not use position @@ -1245,6 +1245,11 @@ void WriteInitialization::writeProperties(const QString &varName, } else if (propertyName == QLatin1String("bottomMargin") && p->kind() == DomProperty::Number) { bottomMargin = p->elementNumber(); continue; + } else if (propertyName == QLatin1String("numDigits") // Deprecated in Qt 4, removed in Qt 5. + && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QLCDNumber"))) { + qWarning("Widget '%s': Deprecated property QLCDNumber::numDigits encountered. It has been replaced by QLCDNumber::digitCount.", + qPrintable(varName)); + propertyName = QLatin1String("digitCount"); } else if (propertyName == QLatin1String("frameShadow")) frameShadowEncountered = true; -- cgit v1.2.3