diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-11 20:32:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-11 20:32:38 (GMT) |
commit | 0808eb1222c70341b0deee3164089c8b6a03ef06 (patch) | |
tree | 513b2ec15785d483530b810550c2d38fac5d84fa /src | |
parent | 008f571d35c199461922026526258e97e5258822 (diff) | |
parent | 5d8a544b34e04d30901658aece96040e252f3b7d (diff) | |
download | Qt-0808eb1222c70341b0deee3164089c8b6a03ef06.zip Qt-0808eb1222c70341b0deee3164089c8b6a03ef06.tar.gz Qt-0808eb1222c70341b0deee3164089c8b6a03ef06.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
rebuild configure
Doc: Fixed a few misspellings of Flipable
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflipable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 6f2ddc3..160872c 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -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 { |