Fixes: - New license, new website.

src/plugins/bineditor/BinEditor.pluginspec

 <plugin name="BinEditor" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Binary editor component.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
         <dependency name="TextEditor" version="1.0.0"/>

src/plugins/bookmarks/Bookmarks.pluginspec

 <plugin name="Bookmarks" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Bookmarks in text editors.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec

 <plugin name="CMakeProjectManager" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>### TODO</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>CMake support</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/coreplugin/Core.pluginspec

 <plugin name="Core" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>The core plugin for the Qt IDE.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
 </plugin>

src/plugins/cpaster/CodePaster.pluginspec

 <plugin name="CodePaster" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Codepaster plugin for pushing/fetching diff from server</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/cppeditor/CppEditor.pluginspec

 <plugin name="CppEditor" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>C/C++ editor component.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
         <dependency name="TextEditor" version="1.0.0"/>

src/plugins/cpptools/CppTools.pluginspec

 <plugin name="CppTools" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Tools for analyzing C/C++ code.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/debugger/Debugger.pluginspec

 <plugin name="Debugger" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Debugger integration.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="CppEditor" version="1.0.0"/><!-- Debugger plugin adds items to the editor's context menu -->
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/designer/Designer.pluginspec

 <plugin name="Designer" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Qt Designer integration.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
 <!-- For compiling with CPP support enabled -->

src/plugins/fakevim/FakeVim.pluginspec

 <plugin name="FakeVim" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>VI-style keyboard navigation.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="CppEditor" version="1.0.0"/><!-- Plugin adds items to the editor's context menu -->
         <dependency name="TextEditor" version="1.0.0"/>

src/plugins/find/Find.pluginspec

 <plugin name="Find" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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 find widget and the hooks for find implementations.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
     </dependencyList>

src/plugins/git/ScmGit.pluginspec

 <plugin name="ScmGit" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Git integration.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/helloworld/HelloWorld.pluginspec

 <plugin name="HelloWorld" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Hello World sample plugin.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
     </dependencyList>

src/plugins/help/Help.pluginspec

 <plugin name="Help" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Help system.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
         <dependency name="Find" version="1.0.0"/>

src/plugins/perforce/Perforce.pluginspec

 <plugin name="Perforce" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Perforce integration.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/projectexplorer/ProjectExplorer.pluginspec

 <plugin name="ProjectExplorer" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>ProjectExplorer framework that can be extended with different kind of project types.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
         <dependency name="Find" version="1.0.0"/>

src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec

 <plugin name="Qt4ProjectManager" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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 project type for Qt 4 pro files and tools.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="TextEditor" version="1.0.0"/>
         <dependency name="ProjectExplorer" version="1.0.0"/>

src/plugins/qtscripteditor/QtScriptEditor.pluginspec

 <plugin name="QtScriptEditor" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Editor for QtScript.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
         <dependency name="TextEditor" version="1.0.0"/>

src/plugins/quickopen/QuickOpen.pluginspec

 <plugin name="QuickOpen" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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 QuickOpen widget and the hooks for QuickOpen filter implementations.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
     </dependencyList>

src/plugins/regexp/RegExp.pluginspec

 <plugin name="RegExp" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
-    <license>Nokia Beta Version License</license>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin 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.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser
+General Public License version 2.1 as published by the Free Software
+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>Regular Expression test widget.</description>
-    <url>http://www.trolltech.com/</url>
+    <url>http://www.qtsoftware.com</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>
     </dependencyList>