diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-07-30 09:52:18 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 09:22:04 (GMT) |
| commit | 6425d8b748225a36181c6e167487e497ecb3558e (patch) | |
| tree | d0f05533d563da2e99719a38896a80e7f07f9532 /src/activeqt/shared | |
| parent | 8d2feb62ae8bac0fb620fa1d047f347be75fbe0e (diff) | |
| download | Qt-6425d8b748225a36181c6e167487e497ecb3558e.zip Qt-6425d8b748225a36181c6e167487e497ecb3558e.tar.gz Qt-6425d8b748225a36181c6e167487e497ecb3558e.tar.bz2 | |
Update contact information in license headers.
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src/activeqt/shared')
| -rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 4 | ||||
| -rw-r--r-- | src/activeqt/shared/qaxtypes.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index f11f597..9371706 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the ActiveQt framework of the Qt Toolkit. ** @@ -34,6 +33,7 @@ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/activeqt/shared/qaxtypes.h b/src/activeqt/shared/qaxtypes.h index 3934653..2de9b4b 100644 --- a/src/activeqt/shared/qaxtypes.h +++ b/src/activeqt/shared/qaxtypes.h @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the ActiveQt framework of the Qt Toolkit. ** @@ -34,6 +33,7 @@ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** ** $QT_END_LICENSE$ ** ****************************************************************************/ |