diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-09 03:45:11 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-09 03:45:11 (GMT) |
| commit | 8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c (patch) | |
| tree | 98652a86fe2125ccb7a7c194b1e1da205f9eb79d /tools/assistant/lib/fulltextsearch/qdocument.cpp | |
| parent | 39bcbc8df52eb5df5f7e39dc4265c8a77d3881be (diff) | |
| parent | 4feb4019cfc144cef4cd9177d52e52dee9ebdf32 (diff) | |
| download | Qt-8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c.zip Qt-8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c.tar.gz Qt-8d37cc2a85f6aa1b9ca3ddc3a923befb4434c62c.tar.bz2 | |
Merge commit '4feb4019cfc144cef4cd9177d52e52dee9ebdf32' into 4.6
Conflicts:
tests/auto/network-settings.h
tests/auto/qpainter/tst_qpainter.cpp
Diffstat (limited to 'tools/assistant/lib/fulltextsearch/qdocument.cpp')
| -rw-r--r-- | tools/assistant/lib/fulltextsearch/qdocument.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/assistant/lib/fulltextsearch/qdocument.cpp b/tools/assistant/lib/fulltextsearch/qdocument.cpp index bad8ea9..06f8340 100644 --- a/tools/assistant/lib/fulltextsearch/qdocument.cpp +++ b/tools/assistant/lib/fulltextsearch/qdocument.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. ** ****************************************************************************/ |