diff options
author | artoka <arto.katajasalo@digia.com> | 2011-12-13 13:06:03 (GMT) |
---|---|---|
committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:08 (GMT) |
commit | 45bdaac4636b69ddbae446ec65082a90290dda52 (patch) | |
tree | 42ebdbee0b784783ceaf53a9d1b38948b8add90c /src | |
parent | 08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f (diff) | |
download | Qt-45bdaac4636b69ddbae446ec65082a90290dda52.zip Qt-45bdaac4636b69ddbae446ec65082a90290dda52.tar.gz Qt-45bdaac4636b69ddbae446ec65082a90290dda52.tar.bz2 |
Various qt documentation fixes (wk 44)
Fixes for bugs: QTBUG-13362, QTBUG-15738, QTBUG-15921,
QTBUG-18356, QTBUG-18417, QTBUG-18664, QTBUG-21562, QTBUG-22094,
and QTBUG-18741.
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qregexp.cpp | 2 | ||||
-rw-r--r-- | src/gui/dialogs/qdialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/dialogs/qmessagebox.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/qabstractbutton.cpp | 4 | ||||
-rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 6 | ||||
-rw-r--r-- | src/xml/dom/qdom.cpp | 4 |
7 files changed, 18 insertions, 8 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index bfdcc33..8c7d34b 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -668,7 +668,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, Wildcard matching can be convenient because of its simplicity, but any wildcard regexp can be defined using full regexps, e.g. - \bold{.*\.html$}. Notice that we can't match both \c .html and \c + \bold{.*\\.html$}. Notice that we can't match both \c .html and \c .htm files with a wildcard unless we use \bold{*.htm*} which will also match 'test.html.bak'. A full regexp gives us the precision we need, \bold{.*\\.html?$}. diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 4c6c3bc..d7d9a95 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -430,7 +430,9 @@ bool QDialog::event(QEvent *e) #endif /*! - Returns the modal dialog's result code, \c Accepted or \c Rejected. + In general returns the modal dialog's result code, \c Accepted or \c Rejected. + + \note When used from QMessageBox instance the result code type is \l QMessageBox::StandardButton Do not call this function if the dialog was constructed with the Qt::WA_DeleteOnClose attribute. diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index f18fe60..ebfc0eb 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -2749,6 +2749,8 @@ QPixmap QMessageBox::standardIcon(Icon icon) When using QMessageBox with custom buttons, this function returns an opaque value; use clickedButton() to determine which button was clicked. + \note The result() function returns also \l StandardButton value instead of \l QDialog::DialogCode + Users cannot interact with any other window in the same application until they close the dialog, either by clicking a button or by using a mechanism provided by the window system. diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 39b15a3..952966e 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -3302,8 +3302,8 @@ QList<QAction*> QWidget::actions() const \property QWidget::enabled \brief whether the widget is enabled - An enabled widget handles keyboard and mouse events; a disabled - widget does not. + In general an enabled widget handles keyboard and mouse events; a disabled + widget does not. An exception is made with \l{QAbstractButton}. Some widgets display themselves differently when they are disabled. For example a button might draw its label grayed out. If diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp index 354677d..0f9a5be 100644 --- a/src/gui/widgets/qabstractbutton.cpp +++ b/src/gui/widgets/qabstractbutton.cpp @@ -114,7 +114,9 @@ Q_GUI_EXPORT extern bool qt_tab_all_widgets; checkable buttons can be checked and unchecked (see below). \o isEnabled() indicates whether the button can be pressed by the - user. + user. \note As opposed to other widgets, buttons derived from + QAbstractButton accepts mouse and context menu events + when disabled. \o setAutoRepeat() sets whether the button will auto-repeat if the user holds it down. \l autoRepeatDelay and \l autoRepeatInterval diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index c097ed9..9b7a9f5 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1226,7 +1226,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact /*! \fn QList<QNetworkProxy> QNetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query) - This function examines takes the query request, \a query, + This function takes the query request, \a query, examines the details of the type of socket or request and returns a list of QNetworkProxy objects that indicate the proxy servers to be used, in order of preference. @@ -1247,7 +1247,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact /*! \fn QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &query) - This function examines takes the query request, \a query, + This function takes the query request, \a query, examines the details of the type of socket or request and returns a list of QNetworkProxy objects that indicate the proxy servers to be used, in order of preference. @@ -1293,7 +1293,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact */ /*! - This function examines takes the query request, \a query, + This function takes the query request, \a query, examines the details of the type of socket or request and returns a list of QNetworkProxy objects that indicate the proxy servers to be used, in order of preference. diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index db5306e..8d655ea 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6570,6 +6570,10 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod element is available using documentElement(). The textual representation of the document can be obtained using toString(). + \note The DOM tree might end up reserving a lot of memory if the XML + document is big. For big XML documents, the QXmlStreamReader or the QXmlQuery + classes might be better solutions. + It is possible to insert a node from another document into the document using importNode(). |