Commit 2919c210 authored by con's avatar con

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
parent 66304bd9

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

/****************************************************************************
**
** 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$
**
****************************************************************************/
......
......@@ -2,7 +2,7 @@
\page index.html
\title Qt Creator
Qt Creator is Qt Software's crossplatform IDE. The core of Qt Creator is
Qt Creator is Nokia's crossplatform IDE. The core of Qt Creator is
basically only a \l{ExtensionSystem}{plugin loader}.
All functionality is implemented in plugins, the basis of Qt Creator is
implemented in the \l{Core} {Core} Plugin. The plugin manager provides
......
......@@ -4,7 +4,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)
**
** Commercial Usage
**
......@@ -23,7 +23,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.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.
**
**************************************************************************/
......
......@@ -4,7 +4,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)
**
** Commercial Usage
**
......@@ -23,7 +23,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.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.
**
**************************************************************************/
......
......@@ -4,7 +4,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)
**
** Commercial Usage
**
......@@ -23,7 +23,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.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.
**
**************************************************************************/
......
......@@ -11,8 +11,8 @@
Development Environment (IDE) to develop Qt projects. It is available for
the Linux, Mac OS X and Windows platforms.
\note Please report bugs and suggestions to the Qt Software task tracker at
http://qt.nokia.com/developer/task-tracker. You can also join the
\note Please report bugs and suggestions to the Qt task tracker at
http://qtsoftware.com/developer/task-tracker. You can also join the
qt-creator@trolltech.com mailing list. To subscribe, send a message with
the word \e subscribe to qt-creator-request@trolltech.com. For more
information on Qt mailing lists, visit http://lists.trolltech.com
......
......@@ -4,7 +4,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)
**
** Commercial Usage
**
......@@ -23,7 +23,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.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.
**
**************************************************************************/
......
......@@ -4,7 +4,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)
**
** Commercial Usage
**
......@@ -23,7 +23,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.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.
**
**************************************************************************/
......
......@@ -4,7 +4,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)
**
** Commercial Usage
**
......@@ -23,7 +23,7 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.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.
**
**************************************************************************/
......
......@@ -1807,7 +1807,7 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<location line="+2"/>
<source>Qt Software</source>
<source>Qt Home</source>
<translation type="unfinished"></translation>
</message>
<message>
......
......@@ -1773,7 +1773,7 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+2"/>
<source>Qt Software</source>
<source>Qt Home</source>
<translation></translation>
</message>
<message>
......
......@@ -1712,8 +1712,8 @@ Vuoi sovrascriverli?</translation>
</message>
<message>
<location line="+2"/>
<source>Qt Software</source>
<translation>Qt Software</translation>
<source>Qt Home</source>
<translation>Qt Home</translation>
</message>
<message>
<location line="+1"/>
......
......@@ -1754,8 +1754,8 @@ Would you like to overwrite them?</source>
</message>
<message>
<location line="+2"/>
<source>Qt Software</source>
<translation>Qt Software</translation>
<source>Qt Home</source>
<translation>Qt Home</translation>
</message>
<message>
<location line="+1"/>
......
......@@ -1458,7 +1458,7 @@ Would you like to overwrite them?</source>
</message>
<message>
<location filename="../../../src/plugins/coreplugin/welcomemode.cpp" line="162"/>