diff options
| author | con <qtc-committer@nokia.com> | 2009-06-16 17:26:44 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-06-16 17:26:44 +0200 |
| commit | 2919c2100712814fa7841fd7695e646c9db235f7 (patch) | |
| tree | 46f6366353f230d27f1ae059b79c281a2b7edf10 /doc/addressbook-sdk.qdoc | |
| parent | 66304bd9fd87e4f89ae37f33b78568cdea737d08 (diff) | |
| download | qt-creator-2919c2100712814fa7841fd7695e646c9db235f7.tar.gz | |
Cherry-pick: Update license headers and sales contact details.
Reviewed-by: Trust Me
Conflicts:
src/libs/cplusplus/CppBindings.cpp
src/libs/cplusplus/CppBindings.h
src/libs/cplusplus/FastPreprocessor.cpp
src/libs/cplusplus/FastPreprocessor.h
src/plugins/cpptools/cppcurrentdocumentfilter.cpp
src/plugins/cpptools/cppcurrentdocumentfilter.h
src/plugins/cpptools/cppsemanticsearch.cpp
src/plugins/cpptools/cppsemanticsearch.h
src/plugins/duieditor/parser/qmljs.g
src/plugins/duieditor/parser/qmljsast.cpp
src/plugins/duieditor/parser/qmljsast_p.h
src/plugins/duieditor/parser/qmljsastfwd_p.h
src/plugins/duieditor/parser/qmljsastvisitor.cpp
src/plugins/duieditor/parser/qmljsastvisitor_p.h
src/plugins/duieditor/parser/qmljsengine_p.cpp
src/plugins/duieditor/parser/qmljsengine_p.h
src/plugins/duieditor/parser/qmljsgrammar.cpp
src/plugins/duieditor/parser/qmljsgrammar_p.h
src/plugins/duieditor/parser/qmljslexer.cpp
src/plugins/duieditor/parser/qmljslexer_p.h
src/plugins/duieditor/parser/qmljsmemorypool_p.h
src/plugins/duieditor/parser/qmljsnodepool_p.h
src/plugins/duieditor/parser/qmljsparser.cpp
src/plugins/duieditor/parser/qmljsparser_p.h
src/plugins/duieditor/parser/qmljsprettypretty.cpp
src/plugins/duieditor/parser/qmljsprettypretty_p.h
src/plugins/duieditor/rewriter/rewriter.cpp
src/plugins/duieditor/rewriter/rewriter_p.h
src/plugins/duieditor/rewriter/textwriter.cpp
src/plugins/duieditor/rewriter/textwriter_p.h
src/shared/cplusplus/ASTClone.cpp
tests/manual/cplusplus/main.cpp
Diffstat (limited to 'doc/addressbook-sdk.qdoc')
| -rw-r--r-- | doc/addressbook-sdk.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index c98243e8d9..5a281e03fd 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |