summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-10-08 14:22:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-08 17:28:36 +0200
commit803dbf529392b9c329d15f7ebdef7c407629a274 (patch)
treee2b975c3eadab7368b12f9bb86f138fa09017a5e /src/tools/uic/cpp
parent27e901de92308d475241c1a1eaf08f7393464545 (diff)
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 <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/tools/uic/cpp')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp7
1 files changed, 6 insertions, 1 deletions
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;