diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
| commit | 660ebda77f6cbc4a41f45f78e18dbc892cd1c551 (patch) | |
| tree | 36ecf9860281d337bfda350c597951623838ca9f /doc/src | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| parent | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (diff) | |
| download | Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.zip Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.gz Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/graphicsview/qgraphicslayout_p.cpp
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/examples/ftp.qdoc | 4 | ||||
| -rwxr-xr-x | doc/src/template/scripts/functions.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc index 4fa2cfd..841d298 100644 --- a/doc/src/examples/ftp.qdoc +++ b/doc/src/examples/ftp.qdoc @@ -131,7 +131,9 @@ \snippet examples/network/qftp/ftpwindow.cpp 5 - QFtp supports canceling the download of files. + QFtp supports canceling the download of files. We make sure that + any file that is currently being written to is closed and removed, + and tidy up by deleting the file object. \snippet examples/network/qftp/ftpwindow.cpp 6 diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index 62bc535..3ab4a08 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -184,7 +184,7 @@ var blankRE=/^\s*$/; function CheckEmptyAndLoadList() { /* Start Extracting information for feedback and adding this to the feedback form */ - var pageUrl = window.location.href; + var pageUrl = window.location.pathname; var pageVal = $('title').html(); $('#pageType').removeClass('red'); $('#feedUrl').remove(); |