From f956531f06faa212e9f93f1795a547a2371f4ae3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 11 Nov 2009 15:59:38 +0100 Subject: uic3: Fix compilation The uic.h/cpp files exist in duplicate due to QDomDocument being used in uic3 and QXmlStreamReader in uic. Reviewed-by: Jarek Kobus --- src/tools/uic3/uic.cpp | 5 +++++ src/tools/uic3/uic.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/tools/uic3/uic.cpp b/src/tools/uic3/uic.cpp index 7872866..6761eaf 100644 --- a/src/tools/uic3/uic.cpp +++ b/src/tools/uic3/uic.cpp @@ -322,6 +322,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")); diff --git a/src/tools/uic3/uic.h b/src/tools/uic3/uic.h index 50aa71c..63a1f8d 100644 --- a/src/tools/uic3/uic.h +++ b/src/tools/uic3/uic.h @@ -114,6 +114,7 @@ public: bool isStatusBar(const QString &className) const; bool isButton(const QString &className) const; bool isContainer(const QString &className) const; + bool isCustomWidgetContainer(const QString &className) const; bool isMenuBar(const QString &className) const; bool isMenu(const QString &className) const; -- cgit v0.12