summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-03-11 23:33:41 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-03-11 23:33:41 (GMT)
commit3a1c77a8d92610f11b95ead77b1d2c68f0883739 (patch)
tree659c500c6da020eede2d8b92f86ef22c5e63d24b /doc/src/snippets/code
parentb7ef079177ceec96f821393796c6c5b14c21704e (diff)
parent655a79094749f13f4b72d94a7b768ac89d21c7f4 (diff)
downloadQt-3a1c77a8d92610f11b95ead77b1d2c68f0883739.zip
Qt-3a1c77a8d92610f11b95ead77b1d2c68f0883739.tar.gz
Qt-3a1c77a8d92610f11b95ead77b1d2c68f0883739.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/doc_src_qmake-manual.qdoc5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index e8c00d3..36676ae 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -996,3 +996,8 @@ symbian {
emulator_dll.condition = WINSCW
}
//! [150]
+
+//! [151]
+RSS_RULES.service_list += "uid = 0x12345678; datatype_list = \{\}; opaque_data = r_my_icon;"
+RSS_RULES.footer +="RESOURCE CAPTION_AND_ICON_INFO r_my_icon \{ icon_file =\"$$PWD/my_icon.svg\"; \}"
+//! [151]