diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-06-06 10:25:17 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-06-06 10:25:17 (GMT) |
| commit | 71cd7dfea1b8f0e287eb1616c0cda5493508c3c4 (patch) | |
| tree | 9b0aedf6a235000164c4cb43eb3a99939611e545 /doc/src/windows-and-dialogs/mainwindow.qdoc | |
| parent | 278c2b360aba87db2d1e5a2d3e14de7260d8a16e (diff) | |
| parent | 408a522ffa25106334c3b29a4799e0d0a1719291 (diff) | |
| download | Qt-71cd7dfea1b8f0e287eb1616c0cda5493508c3c4.zip Qt-71cd7dfea1b8f0e287eb1616c0cda5493508c3c4.tar.gz Qt-71cd7dfea1b8f0e287eb1616c0cda5493508c3c4.tar.bz2 | |
Merge remote branch 'qt/4.8' into fire-master
Conflicts:
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylandclipboard.h
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/s60installs/eabi/QtOpenGLu.def
Diffstat (limited to 'doc/src/windows-and-dialogs/mainwindow.qdoc')
| -rw-r--r-- | doc/src/windows-and-dialogs/mainwindow.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc index e7df502..f2b29c9 100644 --- a/doc/src/windows-and-dialogs/mainwindow.qdoc +++ b/doc/src/windows-and-dialogs/mainwindow.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$ ** ****************************************************************************/ |