Merge remote branch 'origin/2.1'

doc/addressbook-sdk.qdoc

@@ -13,18 +13,12 @@
 ** contained in the Technology Preview License Agreement accompanying
 ** this package.
 **
-** GNU Lesser General Public License Usage
+** GNU Free Documentation License
 **
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU Free
-** General Public License version 2.1 as published by the Free Software
+** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
+** Foundation and appearing in the file included in the packaging of this
-** packaging of this file.  Please review the following information to
+** file.
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.

doc/api/qtcreator-api.qdoc

@@ -1,3 +1,30 @@
+/****************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@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
+**
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+****************************************************************************/
+
 /*!
     \page index.html
     \title Qt Creator

doc/coding-style.qdoc

@@ -1,3 +1,30 @@
+/****************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@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
+**
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+****************************************************************************/
+
 /*!
 
 \contentpage{index.html}{Qt Creator}

doc/examples/doc_src_plugins.qdoc

@@ -1,42 +1,28 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** This file is part of Qt Creator
-** All rights reserved.
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
 ** 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
+** GNU Free Documentation License
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
+** Alternatively, this file may be used under the terms of the GNU Free
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** Documentation License version 1.3 as published by the Free Software
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** Foundation and appearing in the file included in the packaging of this
+** file.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
 **
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
 ****************************************************************************/
 
 //! [0]

doc/maemodev.qdoc

@@ -1,19 +1,20 @@
-/***************************************************************************
+/****************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the documentation of the Qt Toolkit.
+** No Commercial Usage
 **
-** $QT_BEGIN_LICENSE:FDL$
+** This file contains pre-release code and may not be distributed.
-** Commercial Usage
+** You may use this file in accordance with the terms and conditions
-** Licensees holding valid Qt Commercial licenses may use this file in
+** contained in the Technology Preview License Agreement accompanying
-** accordance with the Qt Commercial License Agreement provided with the
+** this package.
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
 **
 ** GNU Free Documentation License
+**
 ** Alternatively, this file may be used under the terms of the GNU Free
 ** Documentation License version 1.3 as published by the Free Software
 ** Foundation and appearing in the file included in the packaging of this
@@ -21,7 +22,6 @@
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
 **
 ****************************************************************************/
 

doc/qtcreator.qdoc

@@ -1,19 +1,20 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** This file is part of Qt Creator
-** All rights reserved.
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the documentation of the Qt Toolkit.
+** No Commercial Usage
 **
-** $QT_BEGIN_LICENSE:FDL$
+** This file contains pre-release code and may not be distributed.
-** Commercial Usage
+** You may use this file in accordance with the terms and conditions
-** Licensees holding valid Qt Commercial licenses may use this file in
+** contained in the Technology Preview License Agreement accompanying
-** accordance with the Qt Commercial License Agreement provided with the
+** this package.
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
 **
 ** GNU Free Documentation License
+**
 ** Alternatively, this file may be used under the terms of the GNU Free
 ** Documentation License version 1.3 as published by the Free Software
 ** Foundation and appearing in the file included in the packaging of this
@@ -21,7 +22,6 @@
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -51,9 +51,9 @@
     \l{http://bugreports.qt.nokia.com}{Qt Bug Tracker}.
     You can also join the Qt Creator mailing list. To subscribe,
     send a message with the word \e subscribe to
-    \l{mailto:qt-creator-request@trolltech.com}
+    \l{mailto:qt-creator-request@qt.nokia.com}
     {qt-creator-request@trolltech.com}. For more information about Qt mailing
-    lists, visit \l{http://lists.trolltech.com}{http://lists.trolltech.com}.
+    lists, visit \l{http://lists.qt.nokia.com}{http://lists.qt.nokia.com}.
 
     \raw HTML
     <img border="0" style="float:right;" src="images/qtcreator-screenshots.png" />
@@ -2406,6 +2406,12 @@
 
     \endlist
 
+    Qt Creator parses all the source files in the project and performs a semantic
+    analysis to build up the information that it needs for functions such as
+    navigation and finding usages. Qt Creator also scans for all include files in
+    your include path recursively, so that it can complete them.
+    Progress bars are displayed during parsing and scanning.
+
 */
 
 
@@ -5635,8 +5641,17 @@
 
     When you start Qt Creator, it looks for the executable specified
     in the \gui{P4 command} field in \gui{Tools > Options... > Version
-    Control > Perforce}. If you do not use Perforce and want to turn
+    Control > Perforce}. If the file is not found, the following error
-    off the check, clear this field.
+    message is displayed in the \gui {Version Control} output pane:
+    \gui {Perforce: Unable to determine the repository: "p4.exe"
+    terminated with exit code 1}. If you use Perforce, check that the
+    path to the executable is specified correctly in the \gui{P4 command}
+    field.
+
+    If you do not use Perforce, you can disable the Perforce plugin to
+    get rid of the error message. Choose \gui {Help > About Plugins} and
+    deselect the \gui Load check box for the \gui Perforce plugin in the
+    \gui {Version Control} group.
 
     The \gui Perforce submenu contains the following additional items:
 

doc/symbiandev.qdoc

@@ -1,19 +1,20 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** This file is part of Qt Creator
-** All rights reserved.
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the documentation of the Qt Toolkit.
+** No Commercial Usage
 **
-** $QT_BEGIN_LICENSE:FDL$
+** This file contains pre-release code and may not be distributed.
-** Commercial Usage
+** You may use this file in accordance with the terms and conditions
-** Licensees holding valid Qt Commercial licenses may use this file in
+** contained in the Technology Preview License Agreement accompanying
-** accordance with the Qt Commercial License Agreement provided with the
+** this package.
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
 **
 ** GNU Free Documentation License
+**
 ** Alternatively, this file may be used under the terms of the GNU Free
 ** Documentation License version 1.3 as published by the Free Software
 ** Foundation and appearing in the file included in the packaging of this
@@ -21,7 +22,6 @@
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
 **
 ****************************************************************************/
 

src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp

@@ -131,6 +131,11 @@ void MaemoSshRunner::stop()
     if (m_state == PostRunCleaning || m_state == StopRequested
         || m_state == Inactive)
         return;
+    if (m_state == Connecting) {
+        setState(Inactive);
+        emit remoteProcessFinished(InvalidExitCode);
+        return;
+    }
 
     setState(StopRequested);
     cleanup();