Merge branch '1.1'

This commit is contained in:
con
2009-04-08 11:46:10 +02:00
31 changed files with 118 additions and 118 deletions

View File

@@ -1,4 +1,4 @@
<plugin name="BinEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="BinEditor" version="1.0.90" compatVersion="1.0.90">
<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>Binary editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Bookmarks" version="1.0.80" compatVersion="1.0.80">
<plugin name="Bookmarks" version="1.0.90" compatVersion="1.0.90">
<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>Bookmarks in text editors.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="CMakeProjectManager" version="1.0.80" compatVersion="1.0.80">
<plugin name="CMakeProjectManager" version="1.0.90" compatVersion="1.0.90">
<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>CMake support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="Help" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
<dependency name="CppEditor" version="1.0.90"/>
<dependency name="Help" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Core" version="1.0.80" compatVersion="1.0.80">
<plugin name="Core" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>

View File

@@ -35,7 +35,7 @@ namespace Constants {
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 0
#define IDE_VERSION_RELEASE 80
#define IDE_VERSION_RELEASE 90
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)

View File

@@ -1,4 +1,4 @@
<plugin name="CodePaster" version="1.0.80" compatVersion="1.0.80">
<plugin name="CodePaster" version="1.0.90" compatVersion="1.0.90">
<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>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="CppEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="CppEditor" version="1.0.90" compatVersion="1.0.90">
<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>C/C++ editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="CppTools" version="1.0.80" compatVersion="1.0.80">
<plugin name="CppTools" version="1.0.90" compatVersion="1.0.90">
<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>Tools for analyzing C/C++ code.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="QuickOpen" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Debugger" version="1.0.80" compatVersion="1.0.80">
<plugin name="Debugger" version="1.0.90" compatVersion="1.0.90">
<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>Debugger integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.0.80"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="Find" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.90"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="Find" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Designer" version="1.0.80" compatVersion="1.0.80">
<plugin name="Designer" version="1.0.90" compatVersion="1.0.90">
<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>Qt Designer integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<!-- For compiling with CPP support enabled -->
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="FakeVim" version="1.0.80" compatVersion="1.0.80">
<plugin name="FakeVim" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.90"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Find" version="1.0.80" compatVersion="1.0.80">
<plugin name="Find" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="GenericProjectManager" version="1.0.80" compatVersion="1.0.80">
<plugin name="GenericProjectManager" version="1.0.90" compatVersion="1.0.90">
<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>Generic support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="Help" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
<dependency name="CppEditor" version="1.0.90"/>
<dependency name="Help" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="ScmGit" version="1.0.80" compatVersion="1.0.80">
<plugin name="ScmGit" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="VCSBase" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="VCSBase" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="HelloWorld" version="1.0.80" compatVersion="1.0.80">
<plugin name="HelloWorld" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Help" version="1.0.80" compatVersion="1.0.80">
<plugin name="Help" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Find" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="Find" version="1.0.90"/>
<dependency name="QuickOpen" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Perforce" version="1.0.80" compatVersion="1.0.80">
<plugin name="Perforce" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="VCSBase" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="VCSBase" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="ProjectExplorer" version="1.0.80" compatVersion="1.0.80">
<plugin name="ProjectExplorer" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Find" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="Find" version="1.0.90"/>
<dependency name="QuickOpen" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Qt4ProjectManager" version="1.0.80" compatVersion="1.0.80">
<plugin name="Qt4ProjectManager" version="1.0.90" compatVersion="1.0.90">
<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>Provides project type for Qt 4 pro files and tools.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="Help" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
<dependency name="CppEditor" version="1.0.90"/>
<dependency name="Help" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="QtScriptEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="QtScriptEditor" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="QuickOpen" version="1.0.80" compatVersion="1.0.80">
<plugin name="QuickOpen" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="RegExp" version="1.0.80" compatVersion="1.0.80">
<plugin name="RegExp" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="ResourceEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="ResourceEditor" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Snippets" version="1.0.80" compatVersion="1.0.80">
<plugin name="Snippets" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="Subversion" version="1.0.80" compatVersion="1.0.80">
<plugin name="Subversion" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="VCSBase" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="VCSBase" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="TextEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="TextEditor" version="1.0.90" compatVersion="1.0.90">
<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.0.80"/>
<dependency name="Find" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="Find" version="1.0.90"/>
<dependency name="QuickOpen" version="1.0.90"/>
</dependencyList>
</plugin>

View File

@@ -1,4 +1,4 @@
<plugin name="VCSBase" version="1.0.80" compatVersion="1.0.80">
<plugin name="VCSBase" version="1.0.90" compatVersion="1.0.90">
<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>Version Control System Base Plugin</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
</dependencyList>
</plugin>