diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 21:38:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 21:38:31 (GMT) |
| commit | 587b0fed9bd17a378eb0212c95074df965549ef2 (patch) | |
| tree | ad5071ee13c83804c782646433d32f5e002af245 /demos/embedded/qmldialcontrol/deployment.pri | |
| parent | b4afd4e4cabce0347e155803afd8ff1a7b90f080 (diff) | |
| parent | 05f4d51a69516aa585f9941960afd483325e562f (diff) | |
| download | Qt-587b0fed9bd17a378eb0212c95074df965549ef2.zip Qt-587b0fed9bd17a378eb0212c95074df965549ef2.tar.gz Qt-587b0fed9bd17a378eb0212c95074df965549ef2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed deployment paths for WebKit declarative plugin.
Fix s60main linking issue with gcce applications
Fixed deployment paths for the symbian/linux-armcc mkspec.
Fixed a relative path problem in qml demos.
Added the APP_PRIVATE_DIR_BASE variable.
Various fixes to autotests when using the symbian/linux-armcc mkspec.
Fixed Symbian resources not honoring TARGET with a path.
Removed useless comments.
Diffstat (limited to 'demos/embedded/qmldialcontrol/deployment.pri')
| -rw-r--r-- | demos/embedded/qmldialcontrol/deployment.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/demos/embedded/qmldialcontrol/deployment.pri index c04ed05..097c74c 100644 --- a/demos/embedded/qmldialcontrol/deployment.pri +++ b/demos/embedded/qmldialcontrol/deployment.pri @@ -1,7 +1,7 @@ qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol symbian { qmldialcontrol_uid3 = A000E3FD - qmldialcontrol_files.path = ../$$qmldialcontrol_uid3 + qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 } qmldialcontrol_files.sources = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content DEPLOYMENT += qmldialcontrol_files |