src/plugins/fakevim/FakeVim.pluginspec

-<plugin name="FakeVim" version="1.2.0" compatVersion="1.2.0">
+<plugin name="FakeVim" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>VI-style keyboard navigation.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="CppEditor" version="1.2.0"/><!-- Plugin adds items to the editor's context menu -->
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="Core" version="1.2.0"/>
+        <dependency name="CppEditor" version="1.2.1"/><!-- Plugin adds items to the editor's context menu -->
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="Core" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/find/Find.pluginspec

-<plugin name="Find" version="1.2.0" compatVersion="1.2.0">
+<plugin name="Find" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides the find widget and the hooks for find implementations.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/genericprojectmanager/GenericProjectManager.pluginspec

-<plugin name="GenericProjectManager" version="1.2.0" compatVersion="1.2.0">
+<plugin name="GenericProjectManager" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Generic support</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="CppTools" version="1.2.0"/>
-        <dependency name="CppEditor" version="1.2.0"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="CppTools" version="1.2.1"/>
+        <dependency name="CppEditor" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/git/ScmGit.pluginspec

-<plugin name="ScmGit" version="1.2.0" compatVersion="1.2.0">
+<plugin name="ScmGit" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Git integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="Core" version="1.2.0"/>
-	<dependency name="VCSBase" version="1.2.0"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="Core" version="1.2.1"/>
+	<dependency name="VCSBase" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/helloworld/HelloWorld.pluginspec

-<plugin name="HelloWorld" version="1.2.0" compatVersion="1.2.0">
+<plugin name="HelloWorld" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Hello World sample plugin.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/help/Help.pluginspec

-<plugin name="Help" version="1.2.0" compatVersion="1.2.0">
+<plugin name="Help" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Help system.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
-        <dependency name="Find" version="1.2.0"/>
-        <dependency name="QuickOpen" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
+        <dependency name="Find" version="1.2.1"/>
+        <dependency name="QuickOpen" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/perforce/Perforce.pluginspec

-<plugin name="Perforce" version="1.2.0" compatVersion="1.2.0">
+<plugin name="Perforce" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Perforce integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="Core" version="1.2.0"/>
-	<dependency name="VCSBase" version="1.2.0"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="Core" version="1.2.1"/>
+	<dependency name="VCSBase" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/projectexplorer/ProjectExplorer.pluginspec

-<plugin name="ProjectExplorer" version="1.2.0" compatVersion="1.2.0">
+<plugin name="ProjectExplorer" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
-        <dependency name="Find" version="1.2.0"/>
-        <dependency name="QuickOpen" version="1.2.0"/>
-        <dependency name="TextEditor" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
+        <dependency name="Find" version="1.2.1"/>
+        <dependency name="QuickOpen" version="1.2.1"/>
+        <dependency name="TextEditor" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/projectexplorer/projecttreewidget.cpp

@@ -178,7 +178,11 @@ void ProjectTreeWidget::foldersAboutToBeRemoved(FolderNode *, const QList<Folder
     while(n) {
         if (FolderNode *fn = qobject_cast<FolderNode *>(n)) {
             if (list.contains(fn)) {
-                m_explorer->setCurrentNode(n->projectNode());
+                ProjectNode *pn = n->projectNode();
+                // Make sure the node we are switching too isn't going to be removed also
+                while (list.contains(pn))
+                    pn = pn->parentFolderNode()->projectNode();
+                m_explorer->setCurrentNode(pn);
                 break;
             }
         }

src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec

-<plugin name="QmlProjectManager" version="1.2.0" compatVersion="1.2.0">
+<plugin name="QmlProjectManager" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Qml support</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="CppTools" version="1.2.0"/>
-        <dependency name="CppEditor" version="1.2.0"/>
-        <dependency name="Help" version="1.2.0"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="CppTools" version="1.2.1"/>
+        <dependency name="CppEditor" version="1.2.1"/>
+        <dependency name="Help" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec

-<plugin name="Qt4ProjectManager" version="1.2.0" compatVersion="1.2.0">
+<plugin name="Qt4ProjectManager" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,11 +19,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides project type for Qt 4 pro files and tools.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="CppTools" version="1.2.0"/>
-        <dependency name="CppEditor" version="1.2.0"/>
-        <dependency name="Help" version="1.2.0"/>
-        <dependency name="Designer" version="1.2.0"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="CppTools" version="1.2.1"/>
+        <dependency name="CppEditor" version="1.2.1"/>
+        <dependency name="Help" version="1.2.1"/>
+        <dependency name="Designer" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/qt4projectmanager/qt4project.cpp

@@ -377,7 +377,11 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
 
 QString Qt4Project::makeCommand(const QString &buildConfiguration) const
 {
-    return qtVersion(buildConfiguration)->toolChain()->makeCommand();
+    ProjectExplorer::ToolChain *tc = qtVersion(buildConfiguration)->toolChain();
+    if (tc)
+        return tc->makeCommand();
+    else
+        return QString();
 }
 
 void Qt4Project::updateCodeModel()

src/plugins/qtscripteditor/QtScriptEditor.pluginspec

-<plugin name="QtScriptEditor" version="1.2.0" compatVersion="1.2.0">
+<plugin name="QtScriptEditor" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for QtScript.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
-        <dependency name="TextEditor" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
+        <dependency name="TextEditor" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/quickopen/QuickOpen.pluginspec

-<plugin name="QuickOpen" version="1.2.0" compatVersion="1.2.0">
+<plugin name="QuickOpen" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/quickopen/basefilefilter.cpp

@@ -32,6 +32,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <QtCore/QDir>
+#include <QtCore/QStringMatcher>
 
 using namespace Core;
 using namespace QuickOpen;

src/plugins/regexp/RegExp.pluginspec

-<plugin name="RegExp" version="1.2.0" compatVersion="1.2.0">
+<plugin name="RegExp" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Regular Expression test widget.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/resourceeditor/ResourceEditor.pluginspec

-<plugin name="ResourceEditor" version="1.2.0" compatVersion="1.2.0">
+<plugin name="ResourceEditor" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for qrc files.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/snippets/Snippets.pluginspec

-<plugin name="Snippets" version="1.2.0" compatVersion="1.2.0">
+<plugin name="Snippets" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Code snippet plugin.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/subversion/Subversion.pluginspec

-<plugin name="Subversion" version="1.2.0" compatVersion="1.2.0">
+<plugin name="Subversion" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Subversion integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.2.0"/>
-        <dependency name="ProjectExplorer" version="1.2.0"/>
-        <dependency name="Core" version="1.2.0"/>
-	<dependency name="VCSBase" version="1.2.0"/>
+        <dependency name="TextEditor" version="1.2.1"/>
+        <dependency name="ProjectExplorer" version="1.2.1"/>
+        <dependency name="Core" version="1.2.1"/>
+	<dependency name="VCSBase" version="1.2.1"/>
     </dependencyList>
 </plugin>

src/plugins/texteditor/TextEditor.pluginspec

-<plugin name="TextEditor" version="1.2.0" compatVersion="1.2.0">
+<plugin name="TextEditor" version="1.2.1" compatVersion="1.2.1">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Text editor framework and the implementation of the basic text editor.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.2.0"/>
-        <dependency name="Find" version="1.2.0"/>
-        <dependency name="QuickOpen" version="1.2.0"/>
+        <dependency name="Core" version="1.2.1"/>
+        <dependency name="Find" version="1.2.1"/>
+        <dependency name="QuickOpen" version="1.2.1"/>
     </dependencyList>
 </plugin>