diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
| commit | 87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3 (patch) | |
| tree | f8b8c24056d54e19937dea1b0301af558597726a /doc/src/snippets/code/src_gui_image_qicon.cpp | |
| parent | 09ce407aaa4a00013a606bf0011faf6cbc654c72 (diff) | |
| parent | 00f7426f3906361fb5addb36e428648eee5e2983 (diff) | |
| download | Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.zip Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.gz Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'doc/src/snippets/code/src_gui_image_qicon.cpp')
| -rw-r--r-- | doc/src/snippets/code/src_gui_image_qicon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_gui_image_qicon.cpp b/doc/src/snippets/code/src_gui_image_qicon.cpp index df1fa82..e0dcfa6 100644 --- a/doc/src/snippets/code/src_gui_image_qicon.cpp +++ b/doc/src/snippets/code/src_gui_image_qicon.cpp @@ -56,8 +56,8 @@ void MyWidget::drawIcon(QPainter *painter, QPoint pos) QPixmap pixmap = icon.pixmap(QSize(22, 22), isEnabled() ? QIcon::Normal : QIcon::Disabled, - isOn() ? QIcon::On - : QIcon::Off); + isChecked() ? QIcon::On + : QIcon::Off); painter->drawPixmap(pos, pixmap); } //! [2] |