diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 09:44:27 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 09:44:27 (GMT) |
| commit | edf7c7c045559b1d03f1d64d2334adac7da88527 (patch) | |
| tree | b17960099bed14a06d53510ac13de0e6255a3e14 /tools/assistant/lib/fulltextsearch/qindexwriter.cpp | |
| parent | 2795a73158280ddce4eec57c643d367bb402a03d (diff) | |
| parent | c8bf9bd17a4520eefe4306b7b1bb4f93fb296d80 (diff) | |
| download | Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.zip Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.tar.gz Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.tar.bz2 | |
Merge commit 'qt-mainline/4.6' into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsscene.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'tools/assistant/lib/fulltextsearch/qindexwriter.cpp')
| -rw-r--r-- | tools/assistant/lib/fulltextsearch/qindexwriter.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp index 93e23e7..66ea6b3 100644 --- a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp +++ b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp @@ -1,10 +1,17 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team. +** All rights reserved. ** -** This file is part of the QCLucene library and is distributable under -** the terms of the LGPL license as specified in the license.txt file. +** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ****************************************************************************/ |