diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
| commit | bcbe1c3438f38087b16465f5b5aeac5d54a42d40 (patch) | |
| tree | d939e5eb97c676fd8202595f405bcd8b0170175c /doc | |
| parent | 1099908428c594d67fe1da740126f4acfcdc8a0a (diff) | |
| parent | c711885b5694a51f0c22908e57e74c60188bd879 (diff) | |
| download | Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.zip Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.gz Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'doc')
| -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 */ |