diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-02 15:39:41 +0200 |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-02 15:39:41 +0200 |
| commit | 6d5963486c8c2a154caf3a2a391bce19cbbeb881 (patch) | |
| tree | 57a132edba61391ef795f3f8ccaa5ea7425cacde /doc | |
| parent | 63e89c45fcc07759c928231ac27cc25928116d45 (diff) | |
| parent | 781967478a0ddc5b69663a49bb081d752f85dc99 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rw-r--r-- | doc/src/examples/ftp.qdoc | 4 | ||||
| -rwxr-xr-x | doc/src/template/scripts/functions.js | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 68d729b8db..253e1b4da9 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -13,12 +13,14 @@ win32:!win32-g++* { unixstyle = true } +COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide + $$unixstyle { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES - COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide } else { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES QDOC = $$replace(QDOC, "/", "\\") + COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc index 4fa2cfd8b1..841d298383 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 62bc53508e..3ab4a082a7 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(); |