diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-08-05 09:56:15 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-08-05 10:01:31 (GMT) |
commit | b997613ebea79f28631bef3e6dd6dde8ebd65e06 (patch) | |
tree | 97cb41b5fa027b647fd29c97b5b7cd097f2f9e81 /examples | |
parent | bbb083a6f195eb885cca01a00b34a7c44258a79e (diff) | |
download | Qt-b997613ebea79f28631bef3e6dd6dde8ebd65e06.zip Qt-b997613ebea79f28631bef3e6dd6dde8ebd65e06.tar.gz Qt-b997613ebea79f28631bef3e6dd6dde8ebd65e06.tar.bz2 |
Fix bad merge on a couple of xml examples
Reviewed-by: mread
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 } |