diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 23:46:38 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 23:46:38 +0100 |
| commit | 4feb76480213eabb38dde410c81c1f9d27ed6af0 (patch) | |
| tree | e6b3d8ecc8b84fc4fee06d9d9bd79fc3eb399d59 /doc | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| parent | a3127c9cd9c7ff408c79685464293224b2641f43 (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/objectmodel/signalsandslots.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/objectmodel/signalsandslots.qdoc b/doc/src/objectmodel/signalsandslots.qdoc index 951a3968a0..0f3f618426 100644 --- a/doc/src/objectmodel/signalsandslots.qdoc +++ b/doc/src/objectmodel/signalsandslots.qdoc @@ -379,7 +379,7 @@ \section1 Signals And Slots With Default Arguments The signatures of signals and slots may contain arguments, and the - arguments can have defualt values. Consider QObject::destroyed(): + arguments can have default values. Consider QObject::destroyed(): \code void destroyed(QObject* = 0); |