diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 2 | ||||
-rw-r--r-- | src/network/access/qabstractnetworkcache.cpp | 2 | ||||
-rw-r--r-- | src/network/access/qnetworkrequest.cpp | 2 | ||||
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 | ||||
-rw-r--r-- | src/widgets/doc/src/modelview.qdoc | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qlabel.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index f59cd4d61b..58e8fcb24d 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -348,7 +348,7 @@ QObjectList QObjectPrivate::senderList() const /*! \internal - Add the connection \a c to to the list of connections of the sender's object + Add the connection \a c to the list of connections of the sender's object for the specified \a signal The signalSlotLock() of the sender and receiver must be locked while calling diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index c86a96cc47..6fd145d921 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -273,7 +273,7 @@ void QPlatformFontDatabase::populateFontDatabase() /*! Returns a multi font engine in the specified \a script to encapsulate \a fontEngine with the - option to fall back to to the fonts given by \a fallbacks if \a fontEngine does not support + option to fall back to the fonts given by \a fallbacks if \a fontEngine does not support a certain character. */ QFontEngineMulti *QPlatformFontDatabase::fontEngineMulti(QFontEngine *fontEngine, diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp index 50f15d51b1..71ddec7c4e 100644 --- a/src/network/access/qabstractnetworkcache.cpp +++ b/src/network/access/qabstractnetworkcache.cpp @@ -225,7 +225,7 @@ QUrl QNetworkCacheMetaData::url() const } /*! - Sets the URL this network cache meta data to to be \a url. + Sets the URL this network cache meta data to be \a url. The password and fragment are removed from the url. diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 9c577f43f5..6d036ad491 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -414,7 +414,7 @@ QUrl QNetworkRequest::url() const } /*! - Sets the URL this network request is referring to to be \a url. + Sets the URL this network request is referring to be \a url. \sa url() */ diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index b29abeec0d..0d3492e639 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -366,7 +366,7 @@ IP_MULTICAST_LOOP (multicast loopback) socket option. \value TypeOfServiceOption This option is not supported on - Windows. This maps to to the IP_TOS socket option. + Windows. This maps to the IP_TOS socket option. Possible values for the \e{TypeOfServiceOption} are: diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc index 200ef8e481..c133005b54 100644 --- a/src/widgets/doc/src/modelview.qdoc +++ b/src/widgets/doc/src/modelview.qdoc @@ -204,7 +204,7 @@ Here is the interesting part: We create an instance of MyModel and use \l{QTableView::setModel()}{tableView.setModel(&myModel);} to pass a - pointer of it to to \l{QTableView}{tableView}. \l{QTableView}{tableView} + pointer of it to \l{QTableView}{tableView}. \l{QTableView}{tableView} will invoke the methods of the pointer it has received to find out two things: diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 504e03320f..8c5026d5f6 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -489,7 +489,7 @@ bool QLabel::wordWrap() const If a label displays text, the indent applies to the left edge if alignment() is Qt::AlignLeft, to the right edge if alignment() is Qt::AlignRight, to the top edge if alignment() is Qt::AlignTop, and - to to the bottom edge if alignment() is Qt::AlignBottom. + to the bottom edge if alignment() is Qt::AlignBottom. If indent is negative, or if no indent has been set, the label computes the effective indent as follows: If frameWidth() is 0, |