diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 10:30:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 10:30:28 (GMT) |
| commit | 0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d (patch) | |
| tree | fab841dffc36c6eae3d7db5a6db2a113d613d2a7 /doc | |
| parent | 532861d77b661f332e5a16c031926da38a813ec5 (diff) | |
| parent | 4e85c1015c2dfa58560e0567af4fa17a412441a5 (diff) | |
| download | Qt-0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d.zip Qt-0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d.tar.gz Qt-0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixed a typo
Doc: QAbstractItemModel: note unexpected behavior with beginMoveRows
Added environment variable graphicssystem switch.
Fixed a problem where QPixmaps where re-bound in non-sharing contexts.
Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.
Make sure we don't pull inn /usr/X11 stuff in the qws mkspek conf
Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/waitconditions.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/waitconditions.qdoc b/doc/src/examples/waitconditions.qdoc index 1d3ff84..d4f680e 100644 --- a/doc/src/examples/waitconditions.qdoc +++ b/doc/src/examples/waitconditions.qdoc @@ -92,7 +92,7 @@ Together, the wait conditions, the mutex, and the \c numUsedBytes counter ensure that the producer is never more than \c BufferSize bytes ahead of the consumer, and that the consumer never reads - data that the consumer hasn't generated yet. + data that the producer hasn't generated yet. \section1 Producer Class |