summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-02-04 13:10:08 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-02-04 13:10:08 (GMT)
commit2b5454432f132f98a1216f1dd8163acb4800191e (patch)
treecd2cca1f9bd5fc6c299734d818d3a8b78c84ce68
parent10c7730877d314ec4eda6728e2d66c38beff8d62 (diff)
downloadQt-2b5454432f132f98a1216f1dd8163acb4800191e.zip
Qt-2b5454432f132f98a1216f1dd8163acb4800191e.tar.gz
Qt-2b5454432f132f98a1216f1dd8163acb4800191e.tar.bz2
Revert "Implement Symbian support for enable_backup CONFIG value"
This reverts commit 10c7730877d314ec4eda6728e2d66c38beff8d62. Maemo/Meego support for this needs to be verified before this can be added so reverting this for now.
-rw-r--r--doc/src/development/qmake-manual.qdoc18
-rw-r--r--mkspecs/common/symbian/backup_registration.xml8
-rw-r--r--mkspecs/features/enable_backup.prf15
3 files changed, 0 insertions, 41 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d1843a8..b81d387 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1086,18 +1086,6 @@
\tableofcontents{3}
-
- \target BACKUP_REGISTRATION_FILE
- \section1 BACKUP_REGISTRATION_FILE
-
- \e {This is only used on the Symbian platform.}
-
- This variable can be used to specify a custom backup registration file to use
- with \c enable_backup \c CONFIG value. See Symbian documentation
- (\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})
- for more information about backup registration files and how backup
- works in Symbian in general.
-
\target BLD_INF_RULES
\section1 BLD_INF_RULES
@@ -1314,12 +1302,6 @@
to work. E.g. \c{myapp_en.ts}.
\bold{Note:} All languages supported by Qt are not supported by Symbian,
so some \c{.ts} files may be ignored by qmake.
- \row \o enable_backup \o Generates deployment for backup registration file
- to enable backing up the application during device backup. By default
- application binaries, resources, and all files under application private
- directory and \c{C:\Data} are backed up. If a custom backup rules are
- needed, \l{#BACKUP_REGISTRATION_FILE}{BACKUP_REGISTRATION_FILE} variable
- can be used to specify a custom backup registration file.
\endtable
These options have an effect on Linux/Unix platforms:
diff --git a/mkspecs/common/symbian/backup_registration.xml b/mkspecs/common/symbian/backup_registration.xml
deleted file mode 100644
index 794e11d..0000000
--- a/mkspecs/common/symbian/backup_registration.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<backup_registration>
- <passive_backup>
- <include_directory name = "\" />
- </passive_backup>
- <system_backup/>
- <restore requires_reboot = "no"/>
-</backup_registration>
diff --git a/mkspecs/features/enable_backup.prf b/mkspecs/features/enable_backup.prf
deleted file mode 100644
index 9e81d56..0000000
--- a/mkspecs/features/enable_backup.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generate deployment for backup registration file
-symbian {
- isEmpty(BACKUP_REGISTRATION_FILE) {
- BACKUP_REGISTRATION_FILE = $$[QT_INSTALL_DATA]/mkspecs/common/symbian/backup_registration.xml
- }
-
- contains(TEMPLATE, app) {
- backup_reg_deployment.path = /private/$$replace(TARGET.UID3, 0x,)
- } else {
- backup_reg_deployment.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
- }
-
- backup_reg_deployment.sources = $$BACKUP_REGISTRATION_FILE
- DEPLOYMENT += backup_reg_deployment
-} \ No newline at end of file