diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
| commit | 7104b7598f6c8d61d008edab227cfce3ec4442fc (patch) | |
| tree | e390a009bbc0826af59b105f7d5501a3f59028a3 /doc/src/getting-started | |
| parent | b827967fef469f66a5a2f975bfafc3cdb82c4ffb (diff) | |
| parent | cb23151d3abfdbdf291abe8a1510592db2011927 (diff) | |
| download | Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.zip Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.gz Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
src/gui/styles/qmacstyle_mac.mm
Diffstat (limited to 'doc/src/getting-started')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index c3b8880..61fa1cd 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -67,7 +67,10 @@ deliberately show off Qt's features. You might want to look at these as well. - \section1 Examples by functional area + These examples are provided under the terms of the \l{BSD License}. + + + \section1 Examples by Functional Area \generatelist{related} */ |