diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 1fc3155cfce..cf5147ea4ae 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5,7 +5,7 @@
\title Qt Creator Manual
- \section1 Version 1.2.0
+ \section1 Version 1.2.1
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
@@ -1718,7 +1718,7 @@
There are some known issues with Qt Creator.
The development team is aware of those, there is no need to report them as bug.
- \section1 Known Issues of Version 1.2.0
+ \section1 Known Issues of Version 1.2.1
\list
\o Gdb on Windows may not work if the 'Embassy \reg Security Center' software
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 1e0e31d7479..55794fca195 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -18,15 +18,15 @@ sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
-qhp.QtCreator.namespace = com.nokia.qtcreator.120
+qhp.QtCreator.namespace = com.nokia.qtcreator.121
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png
-qhp.QtCreator.filterAttributes = qtcreator 1.2.0
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.2.0
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.2.0
+qhp.QtCreator.filterAttributes = qtcreator 1.2.1
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.2.1
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.2.1
# macros.qdocconf
@@ -202,5 +202,5 @@ HTML.footer = "
\n" \
"
\n" \
"Copyright © 2009 Nokia | \n" \
" | \n" \
- "Qt Creator 1.2.0 | \n" \
+ "Qt Creator 1.2.1 | \n" \
"
"
diff --git a/src/app/Info.plist b/src/app/Info.plist
index 5e0332b0a5f..082d764998d 100644
--- a/src/app/Info.plist
+++ b/src/app/Info.plist
@@ -182,8 +182,8 @@
CFBundleIdentifier
com.nokia.qtcreator
CFBundleVersion
- 1.2.0
+ 1.2.1
CFBundleShortVersionString
- 1.2.0
+ 1.2.1
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec
index 78cf35d6af3..90304ea63f6 100644
--- a/src/plugins/bineditor/BinEditor.pluginspec
+++ b/src/plugins/bineditor/BinEditor.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Binary editor component.
http://www.qtsoftware.com
-
-
+
+
diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec
index 56a8808d8b2..e791f9936ef 100644
--- a/src/plugins/bookmarks/Bookmarks.pluginspec
+++ b/src/plugins/bookmarks/Bookmarks.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Bookmarks in text editors.
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
index 68e88913170..14a1a80e186 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
CMake support
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec
index 4db5faab343..33bc4f0e010 100644
--- a/src/plugins/coreplugin/Core.pluginspec
+++ b/src/plugins/coreplugin/Core.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 6e6d650c895..c5401173401 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -35,7 +35,7 @@ namespace Constants {
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 2
-#define IDE_VERSION_RELEASE 0
+#define IDE_VERSION_RELEASE 1
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec
index bd5414b8bf8..3d2cf41caf8 100644
--- a/src/plugins/cpaster/CodePaster.pluginspec
+++ b/src/plugins/cpaster/CodePaster.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Codepaster plugin for pushing/fetching diff from server
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec
index f5a82312210..0d833d5f14d 100644
--- a/src/plugins/cppeditor/CppEditor.pluginspec
+++ b/src/plugins/cppeditor/CppEditor.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
C/C++ editor component.
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec
index d6749f4fdad..9ed939a4288 100644
--- a/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Tools for analyzing C/C++ code.
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec
index ce9598c850c..c9389e017fd 100644
--- a/src/plugins/debugger/Debugger.pluginspec
+++ b/src/plugins/debugger/Debugger.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Debugger integration.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
Disable Cdb debugger engine
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec
index 30725b1e8fb..5fc24794469 100644
--- a/src/plugins/designer/Designer.pluginspec
+++ b/src/plugins/designer/Designer.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Qt Designer integration.
http://www.qtsoftware.com
-
+
-
+
diff --git a/src/plugins/duieditor/DuiEditor.pluginspec b/src/plugins/duieditor/DuiEditor.pluginspec
index 1f3e2111646..41217a32039 100644
--- a/src/plugins/duieditor/DuiEditor.pluginspec
+++ b/src/plugins/duieditor/DuiEditor.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Editor for DUI.
http://www.qtsoftware.com
-
-
+
+
diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec
index 5d36409dd69..7c1dcf855a0 100644
--- a/src/plugins/fakevim/FakeVim.pluginspec
+++ b/src/plugins/fakevim/FakeVim.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
VI-style keyboard navigation.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec
index bbf2d28cf51..740336bedf0 100644
--- a/src/plugins/find/Find.pluginspec
+++ b/src/plugins/find/Find.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Provides the find widget and the hooks for find implementations.
http://www.qtsoftware.com
-
+
diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
index 9d570e1ead3..2d8dc201997 100644
--- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Generic support
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec
index cb59cb620d5..e7639154633 100644
--- a/src/plugins/git/ScmGit.pluginspec
+++ b/src/plugins/git/ScmGit.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Git integration.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec
index 074b759d77a..934067e0d92 100644
--- a/src/plugins/helloworld/HelloWorld.pluginspec
+++ b/src/plugins/helloworld/HelloWorld.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Hello World sample plugin.
http://www.qtsoftware.com
-
+
diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec
index 20ba09c76bf..da19d5beccd 100644
--- a/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Help system.
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec
index 0acab9e6205..646396b9318 100644
--- a/src/plugins/perforce/Perforce.pluginspec
+++ b/src/plugins/perforce/Perforce.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Perforce integration.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
index c6c35819282..7b7c948ef36 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
ProjectExplorer framework that can be extended with different kind of project types.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
index 7a8601377c4..d078132f593 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Qml support
http://www.qtsoftware.com
-
-
-
-
-
+
+
+
+
+
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
index 16d2c09a917..6be8e527d92 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,11 +19,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Provides project type for Qt 4 pro files and tools.
http://www.qtsoftware.com
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
index cc18369ddcf..3c6e2191b3c 100644
--- a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
+++ b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Editor for QtScript.
http://www.qtsoftware.com
-
-
+
+
diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/quickopen/QuickOpen.pluginspec
index f94bed994b0..de857cd6156 100644
--- a/src/plugins/quickopen/QuickOpen.pluginspec
+++ b/src/plugins/quickopen/QuickOpen.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.
http://www.qtsoftware.com
-
+
diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec
index 9db7d03cbdd..2af949f74b7 100644
--- a/src/plugins/regexp/RegExp.pluginspec
+++ b/src/plugins/regexp/RegExp.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Regular Expression test widget.
http://www.qtsoftware.com
-
+
diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec
index 5a469761d91..2e5a046fc8d 100644
--- a/src/plugins/resourceeditor/ResourceEditor.pluginspec
+++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Editor for qrc files.
http://www.qtsoftware.com
-
+
diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec
index c03e66f68b0..c697a3ec819 100644
--- a/src/plugins/snippets/Snippets.pluginspec
+++ b/src/plugins/snippets/Snippets.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Code snippet plugin.
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec
index 9d565db0e2d..9d1dd54db8d 100644
--- a/src/plugins/subversion/Subversion.pluginspec
+++ b/src/plugins/subversion/Subversion.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Subversion integration.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec
index c8f0d13c113..3a22bc2f520 100644
--- a/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Text editor framework and the implementation of the basic text editor.
http://www.qtsoftware.com
-
-
-
+
+
+
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec
index a3d4180b352..30bbd5eaa6f 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec
+++ b/src/plugins/vcsbase/VCSBase.pluginspec
@@ -1,4 +1,4 @@
-
+
Nokia Corporation
(C) 2008-2009 Nokia Corporation
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Version Control System Base Plugin
http://www.qtsoftware.com
-
-
-
+
+
+