Merge branch '0.9.1-beta'

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>

src/plugins/bineditor/bineditor.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bineditor/bineditor.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bineditor/bineditorconstants.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bineditor/bineditorplugin.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bineditor/bineditorplugin.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

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>

src/plugins/bookmarks/bookmark.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bookmarks/bookmark.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bookmarks/bookmarkmanager.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bookmarks/bookmarks_global.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bookmarks/bookmarksplugin.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/bookmarks/bookmarksplugin.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeproject.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectconstants.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectmanager.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectnodes.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakeprojectplugin.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakestep.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/cmakestep.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/cmakeprojectmanager/makestep.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

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>

src/plugins/coreplugin/actionmanager/actioncontainer.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/actioncontainer.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/actionmanager.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/actionmanager.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/actionmanagerinterface.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/command.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/command.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/commandsfile.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/commandsfile.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/iactioncontainer.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/actionmanager/icommand.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/basefilewizard.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/basefilewizard.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/basemode.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/basemode.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/baseview.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/baseview.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/core_global.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/coreconstants.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/coreimpl.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/coreimpl.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/coreplugin.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/coreplugin.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/iwizard.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/newdialog.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/newdialog.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/openwithdialog.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/openwithdialog.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/saveitemsdialog.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/saveitemsdialog.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/settingsdialog.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/settingsdialog.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/shortcutsettings.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/dialogs/shortcutsettings.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editmode.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editmode.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/editorgroup.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/editorgroup.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/editormanager.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/editorsplitter.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/editorsplitter.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/ieditor.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/ieditorfactory.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/openeditorsview.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/openeditorsview.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
     

src/plugins/coreplugin/editormanager/openeditorswindow.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/openeditorswindow.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/stackededitorgroup.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/editormanager/stackededitorgroup.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/fancyactionbar.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/fancyactionbar.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/fancytabwidget.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/fancytabwidget.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/fileiconprovider.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/fileiconprovider.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/filemanager.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/filemanager.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/findplaceholder.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/findplaceholder.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/flowlayout.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/flowlayout.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/generalsettings.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/generalsettings.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/icontext.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/icore.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/icorelistener.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/ifile.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

src/plugins/coreplugin/ifilefactory.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/