summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-08-11 14:59:33 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-08-11 14:59:33 (GMT)
commit1c62dc421cf1ae45fe5089674b4d67fd0f1ff529 (patch)
treedc27fc61fe81c9fffe74c2f91a2a5b148eb9e2b1 /doc/src/snippets
parentac174ba05db74eb5928ac5d3408bca201adf29ca (diff)
parent54ad9d0e8527eef9ce027f90d7c0ec1d9051833a (diff)
downloadQt-1c62dc421cf1ae45fe5089674b4d67fd0f1ff529.zip
Qt-1c62dc421cf1ae45fe5089674b4d67fd0f1ff529.tar.gz
Qt-1c62dc421cf1ae45fe5089674b4d67fd0f1ff529.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/src_gui_image_qicon.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/src/snippets/code/src_gui_image_qicon.cpp b/doc/src/snippets/code/src_gui_image_qicon.cpp
index 2b7c893..455fd84 100644
--- a/doc/src/snippets/code/src_gui_image_qicon.cpp
+++ b/doc/src/snippets/code/src_gui_image_qicon.cpp
@@ -20,3 +20,12 @@ void MyWidget::drawIcon(QPainter *painter, QPoint pos)
painter->drawPixmap(pos, pixmap);
}
//! [2]
+
+//! [3]
+ QIcon undoicon = QIcon::fromTheme("edit-undo");
+//! [3]
+
+//! [4]
+ QIcon undoicon = QIcon::fromTheme("edit-undo", QIcon(":/undo.png"));
+//! [4]
+