AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uic: Map QLCDNumber::numDigits to QLCDNumber::digitCount.

Browse Source 
QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5.

Task-number: QTBUG-27462
Change-Id: I3772a884f31aeea70121cccd429ac996b2ecbccd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Friedemann Kleint 2012-10-08 14:22:27 +02:00 committed by The Qt Project
parent 27e901de92
commit 803dbf5293
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -1179,7 +1179,7 @@ void WriteInitialization::writeProperties(const QString &varName,
const DomProperty *p = lst.at(i); const DomProperty *p = lst.at(i);
if (!checkProperty(m_option.inputFile, p)) if (!checkProperty(m_option.inputFile, p))
continue; continue;
const QString propertyName = p->attributeName(); QString propertyName = p->attributeName();
QString propertyValue; QString propertyValue;
// special case for the property `geometry': Do not use position // 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) { } else if (propertyName == QLatin1String("bottomMargin") && p->kind() == DomProperty::Number) {
bottomMargin = p->elementNumber(); bottomMargin = p->elementNumber();
continue; 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")) } else if (propertyName == QLatin1String("frameShadow"))
frameShadowEncountered = true; frameShadowEncountered = true;