diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 6ef06e9b7ab..dc9672eb60b 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5,7 +5,7 @@
\title Qt Creator Manual
- \section1 Version 1.0.80
+ \section1 Version 1.0.90
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
@@ -76,7 +76,7 @@
\o \l{Keyboard Shortcuts}
\o \l{Glossary}
\o \l{Supported Platforms}
- \o \l{Known Issues of Version 1.0.80}
+ \o \l{Known Issues of Version 1.0.90}
\o \l{Acknowledgements}
\endlist
@@ -1572,9 +1572,9 @@
\page creator-known-issues.html
\nextpage creator-acknowledgements.html
- \title Known Issues of Version 1.0.80
+ \title Known Issues of Version 1.0.90
- There are some known issues with Qt Creator 1.0.80.
+ There are some known issues with Qt Creator 1.0.90.
The development team is aware of those, there is no need to report them as bug.
\list
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 54e147e571c..34e1201b01c 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -18,15 +18,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
-qhp.QtCreator.namespace = com.nokia.qtcreator.1080
+qhp.QtCreator.namespace = com.nokia.qtcreator.1090
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.0.80
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.80
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.80
+qhp.QtCreator.filterAttributes = qtcreator 1.0.90
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.90
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.90
# macros.qdocconf
@@ -202,5 +202,5 @@ HTML.footer = "
\n" \
"
\n" \
"Copyright © 2009 Nokia | \n" \
" | \n" \
- "Qt Creator 1.0.80 | \n" \
+ "Qt Creator 1.0.90 | \n" \
"
"
diff --git a/scripts/replaceVersion.sh b/scripts/replaceVersion.sh
index df1dfebb43c..5475bf7f1e5 100755
--- a/scripts/replaceVersion.sh
+++ b/scripts/replaceVersion.sh
@@ -16,14 +16,14 @@ fi
OLD=`sed 's/\./\\\\./g' <<<"$1"`
NEW=`sed 's/\./\\\\./g' <<<"$2"`
-OLD_MAJOR=`sed 's/^\([0-9]\)\.[0-9]\.[0-9]$/\1/' <<<"$1"`
-NEW_MAJOR=`sed 's/^\([0-9]\)\.[0-9]\.[0-9]$/\1/' <<<"$2"`
+OLD_MAJOR=`sed 's/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/' <<<"$1"`
+NEW_MAJOR=`sed 's/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/' <<<"$2"`
-OLD_MINOR=`sed 's/^[0-9]\.\([0-9]\)\.[0-9]$/\1/' <<<"$1"`
-NEW_MINOR=`sed 's/^[0-9]\.\([0-9]\)\.[0-9]$/\1/' <<<"$2"`
+OLD_MINOR=`sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/' <<<"$1"`
+NEW_MINOR=`sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/' <<<"$2"`
-OLD_RELEASE=`sed 's/^[0-9]\.[0-9]\.\([0-9]\)$/\1/' <<<"$1"`
-NEW_RELEASE=`sed 's/^[0-9]\.[0-9]\.\([0-9]\)$/\1/' <<<"$2"`
+OLD_RELEASE=`sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/' <<<"$1"`
+NEW_RELEASE=`sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/' <<<"$2"`
OLD_THREE="${OLD_MAJOR}${OLD_MINOR}${OLD_RELEASE}"
NEW_THREE="${NEW_MAJOR}${NEW_MINOR}${NEW_RELEASE}"
diff --git a/share/qtcreator/Info.plist b/share/qtcreator/Info.plist
index ee708daece9..4bd0c038a0a 100644
--- a/share/qtcreator/Info.plist
+++ b/share/qtcreator/Info.plist
@@ -182,8 +182,8 @@
CFBundleIdentifier
com.nokia.qtcreator
CFBundleVersion
- 1.0.80
+ 1.0.90
CFBundleShortVersionString
- 1.0.80
+ 1.0.90
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec
index b9e1d15fc0a..bfd74b6b322 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 5cdee7ae40d..045008b66fd 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 68840d33b39..462a58a33e8 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,10 +19,10 @@ 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 848418c2688..3ce1f3e061d 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 3c3903376a0..864aab5fdf5 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 0
-#define IDE_VERSION_RELEASE 80
+#define IDE_VERSION_RELEASE 90
#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 28bfeb89ed2..f434f1a1cd5 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 8f80251789e..240145f22ff 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 e2881a6ffad..1a0f6491f61 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 e8dc76f9e62..75f08849ccf 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,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Debugger integration.
http://www.qtsoftware.com
-
-
-
-
+
+
+
+
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec
index 49cc22deaaa..02fad5e1edf 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/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec
index 92333f49f87..e8c82499477 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 d8a3c653fb1..008b126feba 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 d3cf9fd5131..7c5bfe906ac 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,10 +19,10 @@ 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 04fb4f80542..403a61d13d6 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 834cabfd9b9..82361db3859 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 811c87b05db..cd5b7b1a50d 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 8ba1f9a6e18..dde57cf42a5 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 bc4e4323cf3..f5ea223d30f 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/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
index d7b4033108b..bc9bc160e39 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,10 +19,10 @@ 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 bd2c6da8b7c..b023d3508f4 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 47eed4d0f4d..c4a55308243 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 7105065544e..be4650b98d9 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 d19330439f3..60ccec81f86 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 79a1cf19ded..647e2c98f34 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 ec94605f0ae..0021a199634 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 fae904216ce..8000d860f3c 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 b97b0c5244b..015483dffa9 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
-
-
-
+
+
+