summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-12 22:46:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-12 22:46:38 (GMT)
commit4feb76480213eabb38dde410c81c1f9d27ed6af0 (patch)
treee6b3d8ecc8b84fc4fee06d9d9bd79fc3eb399d59 /doc
parentde20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff)
parenta3127c9cd9c7ff408c79685464293224b2641f43 (diff)
downloadQt-4feb76480213eabb38dde410c81c1f9d27ed6af0.zip
Qt-4feb76480213eabb38dde410c81c1f9d27ed6af0.tar.gz
Qt-4feb76480213eabb38dde410c81c1f9d27ed6af0.tar.bz2
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.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/objectmodel/signalsandslots.qdoc b/doc/src/objectmodel/signalsandslots.qdoc
index 951a396..0f3f618 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);