diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2011-01-14 13:23:56 (GMT) |
|---|---|---|
| committer | Jeremy Katz <jeremy.katz@nokia.com> | 2011-01-14 13:23:56 (GMT) |
| commit | deef2cb5e01b871008b08b81691ad4a46deca328 (patch) | |
| tree | cf693ebcacab43348dc61b2cea4488ed5a9071f5 /src | |
| parent | 93627ef1119e3eadbe2fd6b5d647f0882b3cb91d (diff) | |
| download | Qt-deef2cb5e01b871008b08b81691ad4a46deca328.zip Qt-deef2cb5e01b871008b08b81691ad4a46deca328.tar.gz Qt-deef2cb5e01b871008b08b81691ad4a46deca328.tar.bz2 | |
various fixes to deal with CI gate failures
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_symbian.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/network/kernel/qnetworkproxy_symbian.cpp b/src/network/kernel/qnetworkproxy_symbian.cpp index c1f9c1d..79dfb27 100644 --- a/src/network/kernel/qnetworkproxy_symbian.cpp +++ b/src/network/kernel/qnetworkproxy_symbian.cpp @@ -1,17 +1,17 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtNetwork module of the Qt Toolkit. +** This file is part of the FOO module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** 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 Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,16 +25,16 @@ ** 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. +** +** +** +** +** +** +** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ |