Merge remote branch 'qt-mainline/4.8'

4 files changed, 56 insertions, 3 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index 68d729b..253e1b4 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/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 2bc8a34..0149da2 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1120,6 +1120,44 @@
 
     \tableofcontents{3}
 
+
+    \target BACKUP_REGISTRATION_FILE_MAEMO
+    \section1 BACKUP_REGISTRATION_FILE_MAEMO
+
+    \e {This is only used on the Maemo platform.}
+
+    This variable is used to specify the backup registration file to use with
+    \c enable_backup \c CONFIG value for Maemo platform. The default value is:
+    \c{$$_PRO_FILE_PWD_/backup_registration/maemo/$$basename(TARGET).conf}.
+
+    Unfortunately it is not possible to have a common registration file for Maemo like there is
+    for Symbian, so the developer must always provide one if the platform default backup support is
+    not sufficient.
+
+    For documentation about how to create backup registration files and how the device
+    backup works in general, see:
+    (\l{http://wiki.maemo.org/Documentation/Maemo_5_Developer_Guide/Generic_Platform_Components/Using_Backup_Application}{Using Backup Application})
+
+    \target BACKUP_REGISTRATION_FILE_SYMBIAN
+    \section1 BACKUP_REGISTRATION_FILE_SYMBIAN
+
+    \e {This is only used on the Symbian platform.}
+
+    This variable is used to specify the backup registration file to use with
+    \c enable_backup \c CONFIG value for Symbian platform. The default value is
+    determined as follows:
+
+    If a custom registration file \c{$$_PRO_FILE_PWD_/backup_registration/symbian/backup_registration.xml}
+    exists, it is used. Otherwise, the common registration file \c{$$[QT_INSTALL_DATA]/mkspecs/common/symbian/backup_registration.xml}
+    is used. This common registration file will define backing up of application binaries,
+    resources, and all files under application private directory. Also note that \c{C:/Data}
+    contents are backed up by default on Symbian devices, so no registration is needed for any
+    files found there.
+
+    For documentation about how to create backup registration files and how the device
+    backup works in general, see:
+    (\l{http://library.forum.nokia.com/index.jsp?topic=/S60_5th_Edition_Cpp_Developers_Library/GUID-35228542-8C95-4849-A73F-2B4F082F0C44/sdk/doc_source/guide/Connectivity-subsystem-guide/Connectivity/PC_Connectivity_How-To_Write_Backup_Aware_Software.html}{How-To Write Backup-aware Software})
+
     \target BLD_INF_RULES
     \section1 BLD_INF_RULES
 
@@ -1341,6 +1379,17 @@
          so some \c{.ts} files may be ignored by qmake.
     \endtable
 
+    These options only have an effect on Symbian and Maemo platforms:
+
+    \table 95%
+    \header \o Option \o Description
+    \row \o enable_backup \o Generates deployment for backup registration file
+         to enable backing up the application during device backup.
+         See \l{#BACKUP_REGISTRATION_FILE_MAEMO}{BACKUP_REGISTRATION_FILE_MAEMO}
+         and \l{#BACKUP_REGISTRATION_FILE_SYMBIAN}{BACKUP_REGISTRATION_FILE_SYMBIAN}
+         for more information about backup.
+    \endtable
+
     These options have an effect on Linux/Unix platforms:
 
     \table 95%
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();