diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-01 13:24:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-01 13:24:34 (GMT) |
| commit | 6e021a61316ff0b281e8542858d4442cef7ed70c (patch) | |
| tree | 19ed48c75e376b5258db06626f79067a7335852b /doc/src/examples/styleplugin.qdoc | |
| parent | d448205c2e7ae31ae0814696c2c1d38ff56385bd (diff) | |
| parent | f79ce83f487b384133a2657f33f7c2853d8e89a2 (diff) | |
| download | Qt-6e021a61316ff0b281e8542858d4442cef7ed70c.zip Qt-6e021a61316ff0b281e8542858d4442cef7ed70c.tar.gz Qt-6e021a61316ff0b281e8542858d4442cef7ed70c.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (26 commits)
Add a brief to all demos and examples for manifest
QSslCertificate: also check common name for blacklisted certificates
QSslCertificate: regenerate blacklisted certificates, they were expired
don't crash when destroying the shortcuts
Doc: added since tag to QDateTime::msecsTo
QSslCertificate: blacklist fraudulent *.google.com
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
...
Diffstat (limited to 'doc/src/examples/styleplugin.qdoc')
| -rw-r--r-- | doc/src/examples/styleplugin.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/styleplugin.qdoc b/doc/src/examples/styleplugin.qdoc index 59729c7..a38b8d7 100644 --- a/doc/src/examples/styleplugin.qdoc +++ b/doc/src/examples/styleplugin.qdoc @@ -29,7 +29,7 @@ \example tools/styleplugin \title Style Plugin Example - This example shows how to create a plugin that extends Qt with a new + \brief The Style Plugin example shows how to create a plugin that extends Qt with a new GUI look and feel. \image stylepluginexample.png |