diff options
author | hjk <qtc-committer@nokia.com> | 2008-12-16 17:37:03 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2008-12-16 17:37:03 +0100 |
commit | 0ed740aec691d249be59ac8806b286919bc657e9 (patch) | |
tree | 55cd624b7bd33ec42303114e07f58d9756ba7175 | |
parent | afe3ea995a8557f0c6484d8857b343369e476c84 (diff) | |
parent | 791217bad4c187d1415ca305c5b81dbb8492cce6 (diff) |
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
23 files changed, 23 insertions, 23 deletions
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index 9e09f93eec..4c79a18f25 100644 --- a/src/plugins/bineditor/BinEditor.pluginspec +++ b/src/plugins/bineditor/BinEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="BinEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Binary editor component.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec index 359ab6d203..e6ef924e48 100644 --- a/src/plugins/bookmarks/Bookmarks.pluginspec +++ b/src/plugins/bookmarks/Bookmarks.pluginspec @@ -1,7 +1,7 @@ <plugin name="Bookmarks" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Bookmarks in text editors.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec index 28b9067ed2..ef7a7e38f0 100644 --- a/src/plugins/coreplugin/Core.pluginspec +++ b/src/plugins/coreplugin/Core.pluginspec @@ -1,7 +1,7 @@ <plugin name="Core" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>The core plugin for the Qt IDE.</description> <url>http://www.trolltech.com/</url> </plugin> diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec index 7a1be0b876..7f3e1261af 100644 --- a/src/plugins/cpaster/CodePaster.pluginspec +++ b/src/plugins/cpaster/CodePaster.pluginspec @@ -1,7 +1,7 @@ <plugin name="CodePaster" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Codepaster plugin for pushing/fetching diff from server</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec index 119f0461a6..992f655d95 100644 --- a/src/plugins/cppeditor/CppEditor.pluginspec +++ b/src/plugins/cppeditor/CppEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="CppEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>C/C++ editor component.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec index ca4a8a0e52..08690446e2 100644 --- a/src/plugins/cpptools/CppTools.pluginspec +++ b/src/plugins/cpptools/CppTools.pluginspec @@ -1,7 +1,7 @@ <plugin name="CppTools" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Tools for analyzing C/C++ code.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec index d68c17517e..399ac3c231 100644 --- a/src/plugins/debugger/Debugger.pluginspec +++ b/src/plugins/debugger/Debugger.pluginspec @@ -1,7 +1,7 @@ <plugin name="Debugger" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Debugger integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec index d1df125dbe..bc57324c4f 100644 --- a/src/plugins/designer/Designer.pluginspec +++ b/src/plugins/designer/Designer.pluginspec @@ -1,7 +1,7 @@ <plugin name="Designer" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Qt Designer integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec index 13f712235b..2dd9dba1a8 100644 --- a/src/plugins/find/Find.pluginspec +++ b/src/plugins/find/Find.pluginspec @@ -1,7 +1,7 @@ <plugin name="Find" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Provides the find widget and the hooks for find implementations.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec index 1f511448a0..53f6184b80 100644 --- a/src/plugins/git/ScmGit.pluginspec +++ b/src/plugins/git/ScmGit.pluginspec @@ -1,7 +1,7 @@ <plugin name="ScmGit" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Git integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec index 9cd262ca4d..dab4cbfd3c 100644 --- a/src/plugins/helloworld/HelloWorld.pluginspec +++ b/src/plugins/helloworld/HelloWorld.pluginspec @@ -1,7 +1,7 @@ <plugin name="HelloWorld" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Hello World sample plugin.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec index b60b320827..dfd438522a 100644 --- a/src/plugins/help/Help.pluginspec +++ b/src/plugins/help/Help.pluginspec @@ -1,7 +1,7 @@ <plugin name="Help" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Help system.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec index 367b3afd79..496e420c36 100644 --- a/src/plugins/perforce/Perforce.pluginspec +++ b/src/plugins/perforce/Perforce.pluginspec @@ -1,7 +1,7 @@ <plugin name="Perforce" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Perforce integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec index 1673c3f399..a60bbdf294 100644 --- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec +++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec @@ -1,7 +1,7 @@ <plugin name="ProjectExplorer" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>ProjectExplorer framework that can be extended with different kind of project types.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec index 8e16623886..c5d09426de 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec @@ -1,7 +1,7 @@ <plugin name="Qt4ProjectManager" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Provides project type for Qt 4 pro files and tools.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec index 3e70cf5568..f303e35e45 100644 --- a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec +++ b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="QtScriptEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Editor for QtScript.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/quickopen/QuickOpen.pluginspec index 3c92b9cbf8..088f2affc9 100644 --- a/src/plugins/quickopen/QuickOpen.pluginspec +++ b/src/plugins/quickopen/QuickOpen.pluginspec @@ -1,7 +1,7 @@ <plugin name="QuickOpen" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec index 03d0900967..c284def7f3 100644 --- a/src/plugins/regexp/RegExp.pluginspec +++ b/src/plugins/regexp/RegExp.pluginspec @@ -1,7 +1,7 @@ <plugin name="RegExp" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Regular Expression test widget.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec index cddde0b0d9..e46b249dbf 100644 --- a/src/plugins/resourceeditor/ResourceEditor.pluginspec +++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="ResourceEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Editor for qrc files.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec index 362791eb16..9128dc76e9 100644 --- a/src/plugins/snippets/Snippets.pluginspec +++ b/src/plugins/snippets/Snippets.pluginspec @@ -1,7 +1,7 @@ <plugin name="Snippets" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Code snippet plugin.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec index f503ff1340..bddb93aba6 100644 --- a/src/plugins/subversion/Subversion.pluginspec +++ b/src/plugins/subversion/Subversion.pluginspec @@ -1,7 +1,7 @@ <plugin name="Subversion" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Subversion integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec index aaad622ea4..5c9506925c 100644 --- a/src/plugins/texteditor/TextEditor.pluginspec +++ b/src/plugins/texteditor/TextEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="TextEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Text editor framework and the implementation of the basic text editor.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec index da0b618d26..1f9cd30dd2 100644 --- a/src/plugins/vcsbase/VCSBase.pluginspec +++ b/src/plugins/vcsbase/VCSBase.pluginspec @@ -1,7 +1,7 @@ <plugin name="VCSBase" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Version Control System Base Plugin</description> <url>http://www.trolltech.com/</url> <dependencyList> |