diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-17 09:23:06 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-17 09:23:06 (GMT) |
| commit | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (patch) | |
| tree | 1d9b018f9563fa6eff1059291dc9edf94be67c9b /src/declarative/graphicsitems/qdeclarativeflipable.cpp | |
| parent | b5d34f3daafc843c9f9cb63cf8e2733900f0be69 (diff) | |
| parent | ec0d663282e191bfb9837e76e709ed2ffe6e8aac (diff) | |
| download | Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.zip Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.tar.gz Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflipable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflipable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 48b6ba0..49bef3c 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -177,8 +177,8 @@ void QDeclarativeFlipable::retransformBack() /*! \qmlproperty enumeration Flipable::side - The side of the Flippable currently visible. Possible values are \c - Flippable.Front and \c Flippable.Back. + The side of the Flipable currently visible. Possible values are \c + Flipable.Front and \c Flipable.Back. */ QDeclarativeFlipable::Side QDeclarativeFlipable::side() const { |