Commit dc3c156c authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge branch '2.2'

Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
parents 4d69c745 da0e926a
......@@ -277,7 +277,7 @@ we thank the authors who made this possible:
All rights reserved.
Copyright (c) 2010 Denis Mingulov.
Contact: Nokia Corporation (qt-info@nokia.com)
Contact: Nokia Corporation (info@qt.nokia.com)
This file is part of Qt Creator.
......
......@@ -4,14 +4,8 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** 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 Free Documentation License
**
......
......@@ -4,14 +4,8 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** 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 Free Documentation License
**
......
......@@ -4,14 +4,8 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** 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 Free Documentation License
**
......
......@@ -57,5 +57,5 @@ OTHER_FILES = $$HELP_DEP_FILES \
fixnavi.commands = \
cd $$targetPath($$PWD) && \
perl fixnavi.pl -Dqcmanual -Dqtquick \
qtcreator.qdoc maemodev.qdoc symbiandev.qdoc
qtcreator.qdoc maemodev.qdoc symbiandev.qdoc qtcreator-faq.qdoc
QMAKE_EXTRA_TARGETS += fixnavi
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
......@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** You may use this file under the terms of the BSD license as follows:
**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment