diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-04-30 11:33:39 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-04-30 11:33:39 (GMT) |
| commit | 9442115ce46e87bb5a5939980cf900702dc4a87a (patch) | |
| tree | 26f02a55361bcde4f0b221037094ab095c5ce57b /src/declarative/fx/qfximage.cpp | |
| parent | e2f9eb037dfd26e02cad8a31a499a9c92a315d8b (diff) | |
| parent | 5b15e629641281dd87197b22bd4d0dc5dc7c89e1 (diff) | |
| download | Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.zip Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.tar.gz Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfximage.cpp')
| -rw-r--r-- | src/declarative/fx/qfximage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index 9eb8277..dded48c 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -135,7 +135,7 @@ QFxImage::~QFxImage() This property contains the image currently being displayed by this item, which may be an empty pixmap if nothing is currently displayed. If this property is set, the src property will be unset. This property is intended - to be used only in C++, not in XML. + to be used only in C++, not in QML. */ QPixmap QFxImage::pixmap() const { |