diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/ui4.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index 57400c1e3c..bc1039871e 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -39,6 +39,7 @@ using namespace QFormInternal; /******************************************************************************* ** Implementations */ + DomUI::~DomUI() { delete m_widget; @@ -136,6 +137,11 @@ void DomUI::read(QXmlStreamReader &reader) setElementTabStops(v); continue; } + if (!tag.compare(QLatin1String("images"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <images>."); + reader.skipCurrentElement(); + continue; + } if (!tag.compare(QLatin1String("includes"), Qt::CaseInsensitive)) { DomIncludes *v = new DomIncludes(); v->read(reader); @@ -1236,10 +1242,25 @@ void DomCustomWidget::read(QXmlStreamReader &reader) setElementContainer(reader.readElementText().toInt()); continue; } + if (!tag.compare(QLatin1String("sizepolicy"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <sizepolicy>."); + reader.skipCurrentElement(); + continue; + } if (!tag.compare(QLatin1String("pixmap"), Qt::CaseInsensitive)) { setElementPixmap(reader.readElementText()); continue; } + if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <script>."); + reader.skipCurrentElement(); + continue; + } + if (!tag.compare(QLatin1String("properties"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <properties>."); + reader.skipCurrentElement(); + continue; + } if (!tag.compare(QLatin1String("slots"), Qt::CaseInsensitive)) { DomSlots *v = new DomSlots(); v->read(reader); @@ -2111,6 +2132,16 @@ void DomWidget::read(QXmlStreamReader &reader) m_property.append(v); continue; } + if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <script>."); + reader.skipCurrentElement(); + continue; + } + if (!tag.compare(QLatin1String("widgetdata"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <widgetdata>."); + reader.skipCurrentElement(); + continue; + } if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); |