summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/uic.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/uic.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/uic.cpp')
-rw-r--r--src/tools/uic/uic.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 32e5e3d..71b6ac1 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -363,6 +363,11 @@ bool Uic::isContainer(const QString &className) const
|| customWidgetsInfo()->extends(className, QLatin1String("QDockWidget"));
}
+bool Uic::isCustomWidgetContainer(const QString &className) const
+{
+ return customWidgetsInfo()->isCustomWidgetContainer(className);
+}
+
bool Uic::isStatusBar(const QString &className) const
{
return customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"));