diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
commit | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (patch) | |
tree | eb6aacda7fda551bcfbcfd6b0d192b2389bd094e /doc/src/snippets/code/doc_src_appicon.qdoc | |
parent | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (diff) | |
parent | 1470504e15662acf37bacc58359527f88efc43ab (diff) | |
download | Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.zip Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.gz Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
tools/configure/configureapp.cpp
Diffstat (limited to 'doc/src/snippets/code/doc_src_appicon.qdoc')
-rw-r--r-- | doc/src/snippets/code/doc_src_appicon.qdoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_appicon.qdoc b/doc/src/snippets/code/doc_src_appicon.qdoc index c8883fe..c763a68 100644 --- a/doc/src/snippets/code/doc_src_appicon.qdoc +++ b/doc/src/snippets/code/doc_src_appicon.qdoc @@ -21,3 +21,7 @@ kde-config --path icon //! [4] gnome-config --datadir //! [4] + +//! [5] +ICON = myapp.svg +//! [5] |