diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-29 08:51:04 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-29 08:51:04 (GMT) |
| commit | fc87ef723d5a030fd701257eeca471e450e08fbb (patch) | |
| tree | dcd380c789de4cc2b586c66277b39b8c9fc0d76f /examples | |
| parent | 87136163dcd7ffb8759875bca2b4e559a32167cd (diff) | |
| parent | e154fb84b075ad3fda4ac02d620b28cc50e46c09 (diff) | |
| download | Qt-fc87ef723d5a030fd701257eeca471e450e08fbb.zip Qt-fc87ef723d5a030fd701257eeca471e450e08fbb.tar.gz Qt-fc87ef723d5a030fd701257eeca471e450e08fbb.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/xml/dombookmarks/dombookmarks.pro | 4 | ||||
| -rw-r--r-- | examples/xml/streambookmarks/streambookmarks.pro | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 374d9e3..1cee772 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -11,11 +11,9 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel sources.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - symbian: { include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - addFiles.sources = frank.xbel jennifer.xbel + addFiles.files = frank.xbel jennifer.xbel addFiles.path = files DEPLOYMENT += addFiles } diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro index 0f2d55d..822a1ca 100644 --- a/examples/xml/streambookmarks/streambookmarks.pro +++ b/examples/xml/streambookmarks/streambookmarks.pro @@ -15,7 +15,7 @@ INSTALLS += target sources symbian: { include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - addFiles.sources = frank.xbel jennifer.xbel + addFiles.files = frank.xbel jennifer.xbel addFiles.path = /data/qt/streambookmarks DEPLOYMENT += addFiles } |