diff options
| author | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
|---|---|---|
| committer | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
| commit | aff6cbac0eeaa0f1184cfa6f69818827b71cb222 (patch) | |
| tree | 93b579a4879a8c9d33dbcdbafffe8fb363d71c78 /doc/src/examples/calculatorform.qdoc | |
| parent | 4ec80735d3e8bdbc4e38288c974426e77eedcd00 (diff) | |
| parent | 0f8eddaf60e3854aeda4c5d16cd740cc510ca941 (diff) | |
| download | Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.zip Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.gz Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
doc/src/external-resources.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
"external-resources.qdoc" manually merged
"how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
Diffstat (limited to 'doc/src/examples/calculatorform.qdoc')
| -rw-r--r-- | doc/src/examples/calculatorform.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/examples/calculatorform.qdoc b/doc/src/examples/calculatorform.qdoc index 203998f..e1025b6 100644 --- a/doc/src/examples/calculatorform.qdoc +++ b/doc/src/examples/calculatorform.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$ ** ****************************************************************************/ |