summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-09 18:38:35 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-09 18:44:07 (GMT)
commitd46b4208147ec01aba19c703f21954f068b4dc06 (patch)
treeba2a5862217895c9f5e9e905dc414bc422f9cbf9 /src
parentb770abdd564f28a8d9dde816f72f73e6b15984af (diff)
downloadQt-d46b4208147ec01aba19c703f21954f068b4dc06.zip
Qt-d46b4208147ec01aba19c703f21954f068b4dc06.tar.gz
Qt-d46b4208147ec01aba19c703f21954f068b4dc06.tar.bz2
Doc: Added an example to demonstrate the QWebElement class.
Reviewed-by: Trust Me
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwidget.cpp11
-rw-r--r--src/gui/kernel/qwidget.h4
2 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index f856b13..185fa4e 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -11462,6 +11462,17 @@ void QWidget::languageChange() { } // compat
\sa QWidget::setMaximumSize()
*/
+/*!
+ \fn QWidget::setupUi(QWidget *widget)
+
+ Sets up the user interface for the specified \a widget.
+
+ \note This function is available with widgets that derive from user
+ interface descriptions created using \l{uic}.
+
+ \sa {Using a Designer UI File in Your Application}
+*/
+
QRect QWidgetPrivate::frameStrut() const
{
Q_Q(const QWidget);
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index b7c55f9..5ba1d23 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -288,6 +288,10 @@ public:
void setMaximumWidth(int maxw);
void setMaximumHeight(int maxh);
+#ifdef Q_QDOC
+ void setupUi(QWidget *widget);
+#endif
+
QSize sizeIncrement() const;
void setSizeIncrement(const QSize &);
void setSizeIncrement(int w, int h);