diff options
| -rw-r--r-- | examples/widgets/doc/src/addressbook-tutorial.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/scribble.qdoc | 2 | ||||
| -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 |
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/widgets/doc/src/addressbook-tutorial.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc index c9c22dffe87..af966b77d27 100644 --- a/examples/widgets/doc/src/addressbook-tutorial.qdoc +++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc @@ -689,7 +689,7 @@ We set the layout and window title, as well as connect the signals to their respective slots. Notice that \c{findButton}'s \l{QPushButton::clicked()} - {clicked()} signal is connected to to \c findClicked() and + {clicked()} signal is connected to \c findClicked() and \l{QDialog::accept()}{accept()}. The \l{QDialog::accept()}{accept()} slot provided by QDialog hides the dialog and sets the result code to \l{QDialog::}{Accepted}. We use this function to help \c{AddressBook}'s diff --git a/examples/widgets/doc/src/scribble.qdoc b/examples/widgets/doc/src/scribble.qdoc index 4341b220184..8798197e567 100644 --- a/examples/widgets/doc/src/scribble.qdoc +++ b/examples/widgets/doc/src/scribble.qdoc @@ -47,7 +47,7 @@ With the Scribble application the users can draw an image. The \uicontrol File menu gives the users the possibility to open and edit an existing image file, save an image and exit the application. While - drawing, the \uicontrol Options menu allows the users to to choose the + drawing, the \uicontrol Options menu allows the users to choose the pen color and pen width, as well as clear the screen. In addition the \uicontrol Help menu provides the users with information about the Scribble example in particular, and about Qt in general. diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index f59cd4d61b3..58e8fcb24db 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 c86a96cc474..6fd145d921e 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 50f15d51b14..71ddec7c4ea 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 9c577f43f55..6d036ad4910 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 b29abeec0d5..0d3492e639b 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 200ef8e4816..c133005b54c 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 504e03320f4..8c5026d5f6e 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, |