diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 04:07:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 04:07:06 (GMT) |
| commit | 406f7cb7f7dd4d6d80ffb99335600aa776cc71e2 (patch) | |
| tree | 1e37a53a42c30b87825cbab257a49dce3c0122d2 /demos/embedded/qmldialcontrol | |
| parent | dc37f4ff3439e44df65d24aea4354c80d2a02293 (diff) | |
| parent | 75db37022a9fd479e2a446b57e774eaf8e3e73ea (diff) | |
| download | Qt-406f7cb7f7dd4d6d80ffb99335600aa776cc71e2.zip Qt-406f7cb7f7dd4d6d80ffb99335600aa776cc71e2.tar.gz Qt-406f7cb7f7dd4d6d80ffb99335600aa776cc71e2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Convert examples and demos to use Bearer Management.
Fixes deployment rules for embedded qml demos application.
Fix build on Symbian.
Diffstat (limited to 'demos/embedded/qmldialcontrol')
| -rw-r--r-- | demos/embedded/qmldialcontrol/deployment.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/demos/embedded/qmldialcontrol/deployment.pri index 097c74c..e0e72e6 100644 --- a/demos/embedded/qmldialcontrol/deployment.pri +++ b/demos/embedded/qmldialcontrol/deployment.pri @@ -1,5 +1,6 @@ qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol symbian { + load(data_caging_paths) qmldialcontrol_uid3 = A000E3FD qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 } |