diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-24 17:20:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-24 17:20:58 (GMT) |
| commit | e463546d11464699061574d671d5cd5f3c14f05f (patch) | |
| tree | 8be5e318067dd7954f4af0c680538d96aca07989 /doc/src/platforms/emb-framebuffer-howto.qdoc | |
| parent | 4adf280fb6bda8e519bf23606b841e040cb04fab (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| download | Qt-e463546d11464699061574d671d5cd5f3c14f05f.zip Qt-e463546d11464699061574d671d5cd5f3c14f05f.tar.gz Qt-e463546d11464699061574d671d5cd5f3c14f05f.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'doc/src/platforms/emb-framebuffer-howto.qdoc')
| -rw-r--r-- | doc/src/platforms/emb-framebuffer-howto.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/platforms/emb-framebuffer-howto.qdoc b/doc/src/platforms/emb-framebuffer-howto.qdoc index aad1e25..1e45d9a 100644 --- a/doc/src/platforms/emb-framebuffer-howto.qdoc +++ b/doc/src/platforms/emb-framebuffer-howto.qdoc @@ -7,20 +7,20 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Free Documentation License ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ |