diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-01 03:39:38 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-01 03:39:38 (GMT) |
| commit | e15129c0fb995fcfc120aa4b6e7ec56f9254d10b (patch) | |
| tree | d72cee67b4809455cb775376707d843a2041b716 /examples/mainwindows/dockwidgets/mainwindow.cpp | |
| parent | 49e4975e96ac9e2e8e6af1c58d3ed1453a130eb4 (diff) | |
| parent | 25aaa830addf7f9082ed22a34d2f5ff8e89cf4f9 (diff) | |
| download | Qt-e15129c0fb995fcfc120aa4b6e7ec56f9254d10b.zip Qt-e15129c0fb995fcfc120aa4b6e7ec56f9254d10b.tar.gz Qt-e15129c0fb995fcfc120aa4b6e7ec56f9254d10b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/mainwindows/dockwidgets/mainwindow.cpp')
| -rw-r--r-- | examples/mainwindows/dockwidgets/mainwindow.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/examples/mainwindows/dockwidgets/mainwindow.cpp b/examples/mainwindows/dockwidgets/mainwindow.cpp index b32a994..0d4da15 100644 --- a/examples/mainwindows/dockwidgets/mainwindow.cpp +++ b/examples/mainwindows/dockwidgets/mainwindow.cpp @@ -9,8 +9,8 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |