summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/customwidgetsinfo.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-19 13:53:04 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-19 13:53:04 (GMT)
commit4e53466f63bf05e90a69f80fda8580dabc1e9ed0 (patch)
tree0978f427af78291d8dd16004cc4ca33dbe1af433 /src/tools/uic/customwidgetsinfo.cpp
parent5bd71902f97ba75dc93ccf709dbfdd2ffeb361b2 (diff)
parentfbbdf8698fb0444d5170b7d0a14e870ea789398f (diff)
downloadQt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.zip
Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.gz
Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/tools/uic/customwidgetsinfo.cpp')
-rw-r--r--src/tools/uic/customwidgetsinfo.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp
index 70adba2..ca3fd19 100644
--- a/src/tools/uic/customwidgetsinfo.cpp
+++ b/src/tools/uic/customwidgetsinfo.cpp
@@ -88,6 +88,14 @@ bool CustomWidgetsInfo::extends(const QString &classNameIn, const QLatin1String
return false;
}
+bool CustomWidgetsInfo::isCustomWidgetContainer(const QString &className) const
+{
+ if (const DomCustomWidget *dcw = m_customWidgets.value(className, 0))
+ if (dcw->hasElementContainer())
+ return dcw->elementContainer() != 0;
+ return false;
+}
+
QString CustomWidgetsInfo::realClassName(const QString &className) const
{
if (className == QLatin1String("Line"))