diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-03 17:22:25 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-03 17:22:25 (GMT) |
| commit | 07f828276a3d508d533f915ddd46553820a74fb5 (patch) | |
| tree | 1c729d6ded2ec60e2d6e4566dcd619604ee97b81 /doc/src/snippets/code/doc_src_appicon.qdoc | |
| parent | 65b50fe8ad59c8f68fbe56286c2d5a99687ea545 (diff) | |
| parent | 399782c7911c11bba80dd37276f8de0b171c52f8 (diff) | |
| download | Qt-07f828276a3d508d533f915ddd46553820a74fb5.zip Qt-07f828276a3d508d533f915ddd46553820a74fb5.tar.gz Qt-07f828276a3d508d533f915ddd46553820a74fb5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Conflicts:
examples/webkit/webkit.pro
Diffstat (limited to 'doc/src/snippets/code/doc_src_appicon.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_appicon.qdoc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/doc/src/snippets/code/doc_src_appicon.qdoc b/doc/src/snippets/code/doc_src_appicon.qdoc index 06bf861..8dd30a4 100644 --- a/doc/src/snippets/code/doc_src_appicon.qdoc +++ b/doc/src/snippets/code/doc_src_appicon.qdoc @@ -43,16 +43,6 @@ IDI_ICON1 ICON DISCARDABLE "myappico.ico" //! [0] -//! [1] -RC_FILE = myapp.rc -//! [1] - - -//! [2] -ICON = myapp.icns -//! [2] - - //! [3] kde-config --path icon //! [3] @@ -61,7 +51,3 @@ kde-config --path icon //! [4] gnome-config --datadir //! [4] - -//! [5] -ICON = myapp.svg -//! [5] |