diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
| commit | fdd5a4f3c18b47826ebe63d8753cd27164ad8169 (patch) | |
| tree | c78d347f4fe576288a95e8239bbca2da99f0626e /demos | |
| parent | aebc34877fb17405e8e5915760012a82d0178b97 (diff) | |
| parent | 35386ae28887d56cf6fd6f6cc7ceaf0506abe18a (diff) | |
| download | Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.zip Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.gz Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embedded/fluidlauncher/backup_registration.xml | 8 | ||||
| -rw-r--r-- | demos/embedded/fluidlauncher/fluidlauncher.pro | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/demos/embedded/fluidlauncher/backup_registration.xml b/demos/embedded/fluidlauncher/backup_registration.xml new file mode 100644 index 0000000..794e11d --- /dev/null +++ b/demos/embedded/fluidlauncher/backup_registration.xml @@ -0,0 +1,8 @@ +<?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/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index bb8835b..92d6e1e 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -207,8 +207,11 @@ symbian { saxbookmarks.sources += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel saxbookmarks.path = /data/qt/saxbookmarks + fluidbackup.sources = backup_registration.xml + fluidbackup.path = /private/$$replace(TARGET.UID3, 0x,) + DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \ - mifs desktopservices_music desktopservices_images + mifs desktopservices_music desktopservices_images fluidbackup TARGET.EPOCHEAPSIZE = 100000 20000000 } |