diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index c03cbb2924f..53f74af3ebf 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -5,7 +5,7 @@ \title Qt Creator Manual - \section1 Version 1.1.80 + \section1 Version 1.2.0 The goal of Qt Creator is to provide a cross-platform, complete Integrated Development Environment (IDE) to develop Qt projects. It is available for diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 5e8dd25d7f1..f6a1d0b751d 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.1180 +qhp.QtCreator.namespace = com.nokia.qtcreator.120 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.1.80 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.1.80 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.1.80 +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 # macros.qdocconf @@ -202,5 +202,5 @@ HTML.footer = "

\n" \ "\n" \ "\n" \ "\n" \ - "\n" \ + "\n" \ "
Copyright © 2009 Nokia 
Qt Creator 1.1.80
Qt Creator 1.2.0
" diff --git a/scripts/replaceVersion.sh b/scripts/replaceVersion.sh index 5475bf7f1e5..7460518405a 100755 --- a/scripts/replaceVersion.sh +++ b/scripts/replaceVersion.sh @@ -95,7 +95,7 @@ mv -f "${TMPFILE}" "${INSTALLER_RC}" ## Patch Info.plist TMPFILE=`mktemp versionPatch.XXXXXX` -INFO_PLIST="${SCRIPT_DIR}/share/qtcreator/Info.plist" +INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist" echo "Patching \`${INFO_PLIST}'" sed \ -e "s/"${OLD}"/"${NEW}"/" \ diff --git a/src/app/Info.plist b/src/app/Info.plist index 99fab3163ef..5e0332b0a5f 100644 --- a/src/app/Info.plist +++ b/src/app/Info.plist @@ -182,8 +182,8 @@ CFBundleIdentifier com.nokia.qtcreator CFBundleVersion - 1.1.80 + 1.2.0 CFBundleShortVersionString - 1.1.80 + 1.2.0 diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index 8c9a018a4aa..78cf35d6af3 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 5e86f44bb33..56a8808d8b2 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 d5cd5af4fa4..68e88913170 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 2b781ccf2a9..4db5faab343 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 deb160f3a44..cb4f9a1df11 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -34,8 +34,8 @@ namespace Core { namespace Constants { #define IDE_VERSION_MAJOR 1 -#define IDE_VERSION_MINOR 1 -#define IDE_VERSION_RELEASE 80 +#define IDE_VERSION_MINOR 2 +#define IDE_VERSION_RELEASE 0 #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 49c049a6282..bd5414b8bf8 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 9cc8d0b446d..f5a82312210 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 b97194e6fb0..d6749f4fdad 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 5f111813254..ce9598c850c 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 4b6f4c35f61..30725b1e8fb 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 989651ddaea..1f3e2111646 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 d57e61827ea..5d36409dd69 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 7e14ba17fd9..bbf2d28cf51 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 95006db9dfd..9d570e1ead3 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 68f11d6ebe6..cb59cb620d5 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 754f521c9f0..074b759d77a 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 b96876afa8e..20ba09c76bf 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 f271d7b7c03..0acab9e6205 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 eb8ea81324e..c6c35819282 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 7fc7c9efffd..7a8601377c4 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 4fcf00b62f8..16d2c09a917 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 18ac8a5a53b..cc18369ddcf 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 d5fd3bf6641..f94bed994b0 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 4e29e8b8f45..9db7d03cbdd 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 fe7e2f47bfa..5a469761d91 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 b1bf8e51629..c03e66f68b0 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 902f5483259..9d565db0e2d 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 10d0560af4c..c8f0d13c113 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 7123686f51b..a3d4180b352 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 - - - + + +