Merge remote branch 'origin/1.3'

Conflicts:
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec

diff --cc src/plugins/cpptools/CppTools.pluginspec
index aae6bbb,0d80ce3..5ffdb91
--- 1/src/plugins/cpptools/CppTools.pluginspec
--- 2/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec
@@@ -19,8 -19,8 +19,8 @@@ will be met: http://www.gnu.org/license
      <description>Tools for analyzing C/C++ code.</description>
      <url>http://qt.nokia.com</url>
      <dependencyList>
 -        <dependency name="TextEditor" version="1.2.93"/>
 -        <dependency name="ProjectExplorer" version="1.2.93"/>
 -        <dependency name="Locator" version="1.2.93"/>
 +        <dependency name="TextEditor" version="1.3.80"/>
 +        <dependency name="ProjectExplorer" version="1.3.80"/>
-         <dependency name="QuickOpen" version="1.3.80"/>
++        <dependency name="Locator" version="1.3.80"/>
      </dependencyList>
  </plugin>

diff --cc src/plugins/cpptools/cppcodecompletion.cpp
Simple merge

diff --cc src/plugins/cpptools/cppcodecompletion.h
Simple merge

diff --cc src/plugins/help/Help.pluginspec
index 94b8e0d,4248b28..bc77b73
--- 1/src/plugins/help/Help.pluginspec
--- 2/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec
@@@ -19,8 -19,8 +19,8 @@@ will be met: http://www.gnu.org/license
      <description>Help system.</description>
      <url>http://qt.nokia.com</url>
      <dependencyList>
 -        <dependency name="Core" version="1.2.93"/>
 -        <dependency name="Find" version="1.2.93"/>
 -        <dependency name="Locator" version="1.2.93"/>
 +        <dependency name="Core" version="1.3.80"/>
 +        <dependency name="Find" version="1.3.80"/>
-         <dependency name="QuickOpen" version="1.3.80"/>
++        <dependency name="Locator" version="1.3.80"/>
      </dependencyList>
  </plugin>

diff --cc src/plugins/locator/Locator.pluginspec
index a95e802,a49f867..e0de95f
--- 1/src/plugins/quickopen/QuickOpen.pluginspec
--- 2/src/plugins/locator/Locator.pluginspec
+++ b/src/plugins/locator/Locator.pluginspec
@@@ -1,4 -1,4 +1,4 @@@
- <plugin name="QuickOpen" version="1.3.80" compatVersion="1.3.80">
 -<plugin name="Locator" version="1.2.93" compatVersion="1.2.93">
++<plugin name="Locator" version="1.3.80" compatVersion="1.3.80">
      <vendor>Nokia Corporation</vendor>
      <copyright>(C) 2008-2009 Nokia Corporation</copyright>
      <license>
@@@ -16,9 -16,9 +16,9 @@@ General Public License version 2.1 as p
  Foundation.  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.</license>
-     <description>Provides the Locator widget and the hooks for QuickOpen filter implementations.</description>
+     <description>Provides the Locator widget and the hooks for Locator filter implementations.</description>
      <url>http://qt.nokia.com</url>
      <dependencyList>
 -        <dependency name="Core" version="1.2.93"/>
 +        <dependency name="Core" version="1.3.80"/>
      </dependencyList>
  </plugin>

diff --cc src/plugins/projectexplorer/ProjectExplorer.pluginspec
index 00f84ec,59b1cef..26626fa
--- 1/src/plugins/projectexplorer/ProjectExplorer.pluginspec
--- 2/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
@@@ -19,9 -19,9 +19,9 @@@ will be met: http://www.gnu.org/license
      <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
      <url>http://qt.nokia.com</url>
      <dependencyList>
 -        <dependency name="Core" version="1.2.93"/>
 -        <dependency name="Find" version="1.2.93"/>
 -        <dependency name="Locator" version="1.2.93"/>
 -        <dependency name="TextEditor" version="1.2.93"/>
 +        <dependency name="Core" version="1.3.80"/>
 +        <dependency name="Find" version="1.3.80"/>
-         <dependency name="QuickOpen" version="1.3.80"/>
++        <dependency name="Locator" version="1.3.80"/>
 +        <dependency name="TextEditor" version="1.3.80"/>
      </dependencyList>
  </plugin>

diff --cc src/plugins/texteditor/TextEditor.pluginspec
index 8b4a36e,db1e389..b28a6b5
--- 1/src/plugins/texteditor/TextEditor.pluginspec
--- 2/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec
@@@ -19,8 -19,8 +19,8 @@@ will be met: http://www.gnu.org/license
      <description>Text editor framework and the implementation of the basic text editor.</description>
      <url>http://qt.nokia.com</url>
      <dependencyList>
 -        <dependency name="Core" version="1.2.93"/>
 -        <dependency name="Find" version="1.2.93"/>
 -        <dependency name="Locator" version="1.2.93"/>
 +        <dependency name="Core" version="1.3.80"/>
 +        <dependency name="Find" version="1.3.80"/>
-         <dependency name="QuickOpen" version="1.3.80"/>
++        <dependency name="Locator" version="1.3.80"/>
      </dependencyList>
  </plugin>