From e59e08f4e5d3276f6321eb4576d856432c4832a4 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 17 Dec 2010 13:30:49 +0100 Subject: [PATCH 1/5] Doc: fix mailing list info Reviewed-by: con --- doc/qtcreator.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index d92bb248fa9..a9f18a06c30 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -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 From b33188169bbcdcd32e72b3e4fc719f9e3b1806d0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 20 Dec 2010 12:32:52 +0100 Subject: [PATCH 2/5] Doc: parsing and scanning when opening projects Task-number: QTCREATORBUG-3383 Reviewed-by: Thorbjorn Lindeijer --- doc/qtcreator.qdoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index a9f18a06c30..6e13d1ed174 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -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. + */ From f57cb8935f2e87fe558d677efd7efaafd6f72dc2 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 20 Dec 2010 14:53:51 +0100 Subject: [PATCH 3/5] Doc: disabling Perforce plugin To get rid of the error message in Version Control output panel Task-number: QTCREATORBUG-3382 Reviewed-by: Tobias Hunger --- doc/qtcreator.qdoc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 6e13d1ed174..32a339db991 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -5643,8 +5643,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 - off the check, clear this field. + Control > Perforce}. If the file is not found, the following error + 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: From 7864ddcb28e04b842d6a69e64b7e25dd40f19aa7 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 21 Dec 2010 14:02:05 +0100 Subject: [PATCH 4/5] Doc: update license header Reviewed-by: David Boddie --- doc/addressbook-sdk.qdoc | 16 +++++---------- doc/api/qtcreator-api.qdoc | 27 ++++++++++++++++++++++++ doc/coding-style.qdoc | 27 ++++++++++++++++++++++++ doc/examples/doc_src_plugins.qdoc | 34 +++++++++---------------------- doc/maemodev.qdoc | 22 ++++++++++---------- doc/qtcreator.qdoc | 20 +++++++++--------- doc/symbiandev.qdoc | 20 +++++++++--------- 7 files changed, 100 insertions(+), 66 deletions(-) diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index 916766aff39..448ac080e79 100644 --- a/doc/addressbook-sdk.qdoc +++ b/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 -** 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 -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** 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. diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc index f22ef491fee..baa7540f9bf 100644 --- a/doc/api/qtcreator-api.qdoc +++ b/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 diff --git a/doc/coding-style.qdoc b/doc/coding-style.qdoc index 33bba43b1b2..b2645b9e23c 100644 --- a/doc/coding-style.qdoc +++ b/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} diff --git a/doc/examples/doc_src_plugins.qdoc b/doc/examples/doc_src_plugins.qdoc index efcdab026c2..4afe8f141a2 100644 --- a/doc/examples/doc_src_plugins.qdoc +++ b/doc/examples/doc_src_plugins.qdoc @@ -1,42 +1,28 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. +** This file is part of Qt Creator +** +** 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 -** 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. +** GNU Free Documentation License ** -** 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. +** 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. ** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** ****************************************************************************/ //! [0] diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc index b7ed31f20ac..a9c6b404de7 100644 --- a/doc/maemodev.qdoc +++ b/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$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. +** 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 @@ -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$ ** ****************************************************************************/ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 32a339db991..3cb84a83fe1 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -1,19 +1,20 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. +** This file is part of Qt Creator +** +** 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$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. +** 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 @@ -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$ ** ****************************************************************************/ diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 72e72243418..1e512d04e48 100644 --- a/doc/symbiandev.qdoc +++ b/doc/symbiandev.qdoc @@ -1,19 +1,20 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. +** This file is part of Qt Creator +** +** 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$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. +** 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 @@ -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$ ** ****************************************************************************/ From 8d7d17dc781a04b9a66593ca125ba23269c37564 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 15 Dec 2010 17:50:06 +0100 Subject: [PATCH 5/5] Maemo: Fix possible crash on stopping a run control. The crash happens when the run control is stopped before a connection has been established. Task-number: QTCREATORBUG-3374 Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp index db29a62e828..1b2f67cfaed 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp @@ -108,6 +108,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();