diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-05-26 08:16:29 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-05-26 08:16:29 (GMT) |
| commit | ca85a324e2fb5401c582bfa622831652c19028b2 (patch) | |
| tree | f83127cdf1dd0ec5ee32c5b334ec7c0ffdeedd6f /src/gui/dialogs/qprintdialog.qdoc | |
| parent | a816cb0d26ebcef54e9e61c72455509edf6c44b9 (diff) | |
| parent | 59852c9a855e6b9963c27c9a028faf6d23ea9974 (diff) | |
| download | Qt-ca85a324e2fb5401c582bfa622831652c19028b2.zip Qt-ca85a324e2fb5401c582bfa622831652c19028b2.tar.gz Qt-ca85a324e2fb5401c582bfa622831652c19028b2.tar.bz2 | |
Merge remote branch 'upstream/4.8'
Diffstat (limited to 'src/gui/dialogs/qprintdialog.qdoc')
| -rw-r--r-- | src/gui/dialogs/qprintdialog.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/dialogs/qprintdialog.qdoc b/src/gui/dialogs/qprintdialog.qdoc index 0fff9dd..53bbc9b 100644 --- a/src/gui/dialogs/qprintdialog.qdoc +++ b/src/gui/dialogs/qprintdialog.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$ ** ****************************************************************************/ |