diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-10-14 16:17:58 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-10-14 16:17:58 (GMT) |
| commit | d089496936b9a17d7849d49b74f85838cb711634 (patch) | |
| tree | 8395c56f3c1e6b64cb781d7311fda56081f0ef51 /src/corelib | |
| parent | 2543ed5b1b18864797b3a11c9bd13887c7567e86 (diff) | |
| parent | 7a6a50879322945110120ffdec5d0e6820fc4b54 (diff) | |
| download | Qt-d089496936b9a17d7849d49b74f85838cb711634.zip Qt-d089496936b9a17d7849d49b74f85838cb711634.tar.gz Qt-d089496936b9a17d7849d49b74f85838cb711634.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
src/corelib/kernel/qtranslator.cpp
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/io/qurl.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index eabaf10..99f82fa 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2544,7 +2544,7 @@ will imply to use the layout direction set on the parent widget or QApplication. This has the same effect as QWidget::unsetLayoutDirection(). - When LayoutDirectoinAuto is used in conjunction with text layouting, it will imply that the text + When LayoutDirectionAuto is used in conjunction with text layouting, it will imply that the text directionality is determined from the content of the string to be layouted. \sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection(), QTextOption::setTextDirection(), QString::isRightToLeft() diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 2f0fd46..3f49cc6 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -63,8 +63,9 @@ unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL - "http://b\uuml\c{}hler.example.com" would be sent to the server as - "http://xn--bhler-kva.example.com/List%20of%20applicants.xml". + "http://b\uuml\c{}hler.example.com/List of applicants.xml" would be sent to the server as + "http://xn--bhler-kva.example.com/List%20of%20applicants.xml", + and this can be verified by calling the toEncoded() function. A URL can also be constructed piece by piece by calling setScheme(), setUserName(), setPassword(), setHost(), setPort(), |