diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-12 13:02:51 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-12 13:02:51 (GMT) |
| commit | a47bf3d15b589414183a0aa51c710c3763d3d1d1 (patch) | |
| tree | b91434dfa4da5fc98c5cdab42b2671542065af2d /doc/src | |
| parent | 4deacd35b92a6879009248a205139a871e5a589f (diff) | |
| parent | f6e08f1ce23ebf2a3be8d5d4172059187dea2ba3 (diff) | |
| download | Qt-a47bf3d15b589414183a0aa51c710c3763d3d1d1.zip Qt-a47bf3d15b589414183a0aa51c710c3763d3d1d1.tar.gz Qt-a47bf3d15b589414183a0aa51c710c3763d3d1d1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/datastreamformat.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qnamespace.qdoc | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/src/datastreamformat.qdoc b/doc/src/datastreamformat.qdoc index 67a3794..15ac062 100644 --- a/doc/src/datastreamformat.qdoc +++ b/doc/src/datastreamformat.qdoc @@ -301,12 +301,10 @@ \o \list \o Milliseconds since midnight (quint32) \endlist - \row \o QUrl \o \list \o Holds an URL (QString) \endlist - \row \o QVariant \o \list \o The type of the data (quint32) diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index ad59b8d..fc4310b 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -157,6 +157,14 @@ set to true won't be used as a native menubar (e.g, the menubar at the top of the main screen on Mac OS X or at the bottom in Windows CE). + \value AA_MacDontSwapCtrlAndMeta On Mac OS X by default, Qt swaps the + Control and Meta (Command) keys (i.e., whenever Control is pressed, Qt + sends Meta and whenever Meta is pressed Control is sent. When this + attribute is true, Qt will not do the flip. QKeySequence::StandardShortcuts + will also flip accordingly (i.e., QKeySequence::Copy will be + Command+C on the keyboard regardless of the value set, though what is output for + QKeySequence::toString(QKeySequence::PortableText) will be different). + \omitvalue AA_AttributeCount */ |