diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-20 13:30:07 +1000 |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-20 13:30:07 +1000 |
commit | f284deea53e9ce30e27c62167803dad0759c2763 (patch) | |
tree | 070f25299f1f0fab8b56b27bc3810f065f2bd2bf /src | |
parent | a8eb11380e2dde76eccb3f70aa5da4c9490fbee7 (diff) | |
download | qt4-tools-f284deea53e9ce30e27c62167803dad0759c2763.tar.gz |
Revert "Doc: Added an example to demonstrate the QWebElement class."
This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c.
Conflicts:
doc/src/qt4-intro.qdoc
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 11 | ||||
-rw-r--r-- | src/gui/kernel/qwidget.h | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 315f8e7884..31067e1ce1 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11465,17 +11465,6 @@ 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 c13cdf1c99..e0aa722d75 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -288,10 +288,6 @@ 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); |