diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 1fc3155cfce6666bd8e466d5a769e923a36b7f32..cf5147ea4aebfc890f7fc69e39cdf1a8d4bdcf94 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 1e0e31d747939d7ce5830a26fccc13db2d49259b..55794fca195b05225bc34a590e054f0a940c3c68 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 5e0332b0a5f6f46b03c1189f45d31ede34a4d526..082d764998d4300d72127d29424620a043239d8e 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 78cf35d6af3ea1775ff768eb4cc9d0e5b18ac5bd..90304ea63f6d103c2a642bd941a7982751d7e8c5 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 56a8808d8b2c7777af6a3af6761a2834d8badb4e..e791f9936ef6d943156653b150dc935b36e8412b 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 68e8891317015928965b1f2fbcafab80d65a1291..14a1a80e1860d6718eaff8d5419b8357c222328f 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 4db5faab343c70afc2c2f928f9e06cc91fce3f4e..33bc4f0e01096b28daff6bce5693c60dc1529f22 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 6e6d650c895cfd649f955da881ad6be28c4136ee..c54011734011bb753abc859217a38016002f91d8 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 bd5414b8bf8c237f882fb359b92b1e990f12c032..3d2cf41caf8bad618a29df1a8179c3c62f65695b 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 f5a82312210255150b0e56ca29ea4d0051e2f48d..0d833d5f14d12cf6bce3a4a943f108d7ca308fed 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 d6749f4fdada243bb866fc305c9e8dfa2e48bc05..9ed939a4288dcb6341f5d41896942bc6f3876204 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 ce9598c850c114d4d4f7198f0b07d2aa6aa7f8a1..c9389e017fda55c99f36cd45e7aa57d794ccd16b 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 30725b1e8fb2da4bb25c7a61139ffea52adb5519..5fc247944694d91b0a18e54736e61532b0060a09 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 1f3e2111646dc400bd9c4c77c232b726b66e101b..41217a32039024508f543a08ea7152384f3a47a9 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 5d36409dd69c1a5c6e61e870ea08f15a084c754d..7c1dcf855a03aa58f7af3cb61f366b332896820d 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 bbf2d28cf5110b4efedbcc993d4993e7a3dbee2c..740336bedf0e9dbe887a8f37231025c2f3caa6ab 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 9d570e1ead31ae00f4b5529deb27ef6f00abae5d..2d8dc2019971fe477225fce3323e085a6ca7e3b2 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 cb59cb620d57d070f4854ef43293ae29ee4db4c4..e76391546332f41b785a5e47e8ef5e3f697cd499 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 074b759d77a8c4d75bf95f6d7abe20d99e6fed52..934067e0d925a3d755736deec5a9546b0e87dc49 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 20ba09c76bfbcfed9d8094468a8d84d48d105a01..da19d5beccd0b160e4ff0f6d91de3eb875f55728 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 0acab9e6205492daa3a65c2dd23a213abfbc9c8c..646396b9318e3886c23d6a66ce7c4a7b5c98e2fe 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 c6c35819282b74aec3f75dc2dc6e220c5906fc85..7b7c948ef36c9f4313be6d22e6c08a5cd4f5f885 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 7a8601377c47c694e892f29d7fa026748da51adb..d078132f593e1505c502394fa891a9add4f8d3a9 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 16d2c09a917db61c0b72f4664317f322bbdac6ab..6be8e527d92f8e9294421cbd90bb9d909dcf7b89 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 cc18369ddcf92aa93e85163aa3166632b7c97da4..3c6e2191b3c30e03c4af6613d08dc6d0cb218be9 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 f94bed994b09fbb615f8629050a33dc2b6c27402..de857cd61568a24945d35f93ff7e05003ff811ee 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 9db7d03cbdd3b24dff8b1f0f72fbad8ffa21735b..2af949f74b7c20451e18681961c4b6d3e7bce2b8 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 5a469761d911ef4f48a8908b2445b47ba2574784..2e5a046fc8d16bb118075b16cc8bb7829c0cc66c 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 c03e66f68b06fff6297897c54a43515060a960c2..c697a3ec819e5ca432ac45ec40dfb3eea13becce 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 9d565db0e2df45fd541eccef6c682eeeeec18976..9d1dd54db8d3e381a34d5a78369a92ca2af99bf0 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 c8f0d13c11353e8bcd9d54f4dec5538dcb28160b..3a22bc2f520c0f40be5bd0baf20db0c1e8226e75 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 a3d4180b35262c48930a19d7bac018357a25abb0..30bbd5eaa6fb8a6c39d5ec11154f91cace57248d 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
-
-
-
+
+
+