From 7900d97d3abcfb1a2ffd25eb5cc1ee0035da97a2 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 16 Jun 2010 12:16:00 +0200 Subject: [PATCH] Version bump. --- README | 2 +- doc/qt-html-templates.qdocconf | 2 +- doc/qtcreator.qdocconf | 8 ++++---- src/app/Info.plist | 4 ++-- src/plugins/bineditor/BinEditor.pluginspec | 6 +++--- src/plugins/bookmarks/Bookmarks.pluginspec | 8 ++++---- .../CMakeProjectManager.pluginspec | 10 +++++----- src/plugins/coreplugin/Core.pluginspec | 2 +- src/plugins/coreplugin/coreconstants.h | 6 +++--- src/plugins/cpaster/CodePaster.pluginspec | 8 ++++---- src/plugins/cppeditor/CppEditor.pluginspec | 8 ++++---- src/plugins/cpptools/CppTools.pluginspec | 8 ++++---- src/plugins/cvs/CVS.pluginspec | 10 +++++----- src/plugins/debugger/Debugger.pluginspec | 10 +++++----- src/plugins/designer/Designer.pluginspec | 6 +++--- src/plugins/fakevim/FakeVim.pluginspec | 10 +++++----- src/plugins/find/Find.pluginspec | 4 ++-- .../GenericProjectManager.pluginspec | 10 +++++----- src/plugins/git/ScmGit.pluginspec | 10 +++++----- src/plugins/helloworld/HelloWorld.pluginspec | 4 ++-- src/plugins/help/Help.pluginspec | 8 ++++---- src/plugins/locator/Locator.pluginspec | 4 ++-- src/plugins/mercurial/Mercurial.pluginspec | 10 +++++----- src/plugins/perforce/Perforce.pluginspec | 10 +++++----- .../projectexplorer/ProjectExplorer.pluginspec | 10 +++++----- src/plugins/qmldesigner/QmlDesigner.pluginspec | 8 ++++---- src/plugins/qmlinspector/QmlInspector.pluginspec | 14 +++++++------- src/plugins/qmljseditor/QmlJSEditor.pluginspec | 8 ++++---- .../QmlProjectManager.pluginspec | 10 +++++----- .../Qt4ProjectManager.pluginspec | 16 ++++++++-------- src/plugins/regexp/RegExp.pluginspec | 4 ++-- .../resourceeditor/ResourceEditor.pluginspec | 4 ++-- src/plugins/snippets/Snippets.pluginspec | 8 ++++---- src/plugins/subversion/Subversion.pluginspec | 10 +++++----- src/plugins/texteditor/TextEditor.pluginspec | 8 ++++---- src/plugins/vcsbase/VCSBase.pluginspec | 8 ++++---- src/plugins/welcome/Welcome.pluginspec | 4 ++-- 37 files changed, 140 insertions(+), 140 deletions(-) diff --git a/README b/README index 473deabf8ab..8436840543d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Qt Creator 1.3.85 +Qt Creator 2.0.0 =============== Qt Creator is a crossplatform C++ IDE for development with the Qt framework. diff --git a/doc/qt-html-templates.qdocconf b/doc/qt-html-templates.qdocconf index dfec499a29e..edc75f1aa20 100644 --- a/doc/qt-html-templates.qdocconf +++ b/doc/qt-html-templates.qdocconf @@ -27,7 +27,7 @@ HTML.postheader = "
\n" \ "
\n" \ "
\n" \ " \n" \ diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index ea3d7fd1fee..02624c66c61 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -19,12 +19,12 @@ sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc" qhp.projects = QtCreator qhp.QtCreator.file = qtcreator.qhp -qhp.QtCreator.namespace = com.nokia.qtcreator.1385 +qhp.QtCreator.namespace = com.nokia.qtcreator.200 qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = Qt Creator -qhp.QtCreator.filterAttributes = qtcreator 1.3.85 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.85 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.85 +qhp.QtCreator.filterAttributes = qtcreator 2.0.0 +qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.0 +qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.0 qhp.QtCreator.indexRoot = qhp.QtCreator.extraFiles = \ style/style.css \ diff --git a/src/app/Info.plist b/src/app/Info.plist index d8ac3d27287..1c1ea19495a 100644 --- a/src/app/Info.plist +++ b/src/app/Info.plist @@ -219,8 +219,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General CFBundleIdentifier com.nokia.qtcreator CFBundleVersion - 1.3.85 + 2.0.0 CFBundleShortVersionString - 1.3.85 + 2.0.0 diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index 8fed5f4cd35..8497cbf6296 100644 --- a/src/plugins/bineditor/BinEditor.pluginspec +++ b/src/plugins/bineditor/BinEditor.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,7 +14,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Binary editor component. http://qt.nokia.com - - + + diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec index 493a5f84e6f..09e6342b61c 100644 --- a/src/plugins/bookmarks/Bookmarks.pluginspec +++ b/src/plugins/bookmarks/Bookmarks.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Bookmarks in text editors. http://qt.nokia.com - - - + + + diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec index cb422b6b602..88066c5cdff 100644 --- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec +++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General CMake support http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec index 6f81d79b1be..950bd3ca289 100644 --- a/src/plugins/coreplugin/Core.pluginspec +++ b/src/plugins/coreplugin/Core.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 225748599c5..c3409200166 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -35,9 +35,9 @@ namespace Core { namespace Constants { -#define IDE_VERSION_MAJOR 1 -#define IDE_VERSION_MINOR 3 -#define IDE_VERSION_RELEASE 85 +#define IDE_VERSION_MAJOR 2 +#define IDE_VERSION_MINOR 0 +#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 8802a3fe018..b4b8a3b9bf4 100644 --- a/src/plugins/cpaster/CodePaster.pluginspec +++ b/src/plugins/cpaster/CodePaster.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,8 +13,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Codepaster plugin for pushing/fetching diff from server http://qt.nokia.com - - - + + + diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec index 0004110917f..8b0391b811b 100644 --- a/src/plugins/cppeditor/CppEditor.pluginspec +++ b/src/plugins/cppeditor/CppEditor.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General C/C++ editor component. http://qt.nokia.com - - - + + + diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec index c49d07c6d24..49ba3364bc7 100644 --- a/src/plugins/cpptools/CppTools.pluginspec +++ b/src/plugins/cpptools/CppTools.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Tools for analyzing C/C++ code. http://qt.nokia.com - - - + + + diff --git a/src/plugins/cvs/CVS.pluginspec b/src/plugins/cvs/CVS.pluginspec index a7802762fee..67e6e90babb 100644 --- a/src/plugins/cvs/CVS.pluginspec +++ b/src/plugins/cvs/CVS.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General CVS integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec index 10777fbb266..0584bdc34a0 100644 --- a/src/plugins/debugger/Debugger.pluginspec +++ b/src/plugins/debugger/Debugger.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,10 +14,10 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Debugger integration. http://qt.nokia.com - - - - + + + + Disable Cdb debugger engine diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec index 8203f3526d7..d5cc12db08d 100644 --- a/src/plugins/designer/Designer.pluginspec +++ b/src/plugins/designer/Designer.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Qt Designer integration. http://qt.nokia.com - + - + diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec index 277f3a0caa2..1ad00d19f65 100644 --- a/src/plugins/fakevim/FakeVim.pluginspec +++ b/src/plugins/fakevim/FakeVim.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,9 +13,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General VI-style keyboard navigation. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec index 493e10a687b..dc1edf3bd2f 100644 --- a/src/plugins/find/Find.pluginspec +++ b/src/plugins/find/Find.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Provides the find widget and the hooks for find implementations. http://qt.nokia.com - + diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec index 1920e461b4e..9a3bc1883f2 100644 --- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec +++ b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Generic support http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec index 001082f9439..f6a6e41a73d 100644 --- a/src/plugins/git/ScmGit.pluginspec +++ b/src/plugins/git/ScmGit.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Git integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec index 686fa13820d..bec83e9a924 100644 --- a/src/plugins/helloworld/HelloWorld.pluginspec +++ b/src/plugins/helloworld/HelloWorld.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,6 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Hello World sample plugin. http://qt.nokia.com - + diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec index 66b83f508e8..9b4b29d1c4f 100644 --- a/src/plugins/help/Help.pluginspec +++ b/src/plugins/help/Help.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Help system. http://qt.nokia.com - - - + + + diff --git a/src/plugins/locator/Locator.pluginspec b/src/plugins/locator/Locator.pluginspec index 380edb01443..75707873717 100644 --- a/src/plugins/locator/Locator.pluginspec +++ b/src/plugins/locator/Locator.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Provides the Locator widget and the hooks for Locator filter implementations. http://qt.nokia.com - + diff --git a/src/plugins/mercurial/Mercurial.pluginspec b/src/plugins/mercurial/Mercurial.pluginspec index 65acdb7cfac..628c1ef5dce 100644 --- a/src/plugins/mercurial/Mercurial.pluginspec +++ b/src/plugins/mercurial/Mercurial.pluginspec @@ -1,4 +1,4 @@ - + Brian McGillion (C) 2008-2009 Brian McGillion @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Mercurial integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec index f1e0b412daa..fe1dd590078 100644 --- a/src/plugins/perforce/Perforce.pluginspec +++ b/src/plugins/perforce/Perforce.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Perforce integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec index 669664b60ca..a2735814282 100644 --- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec +++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,10 +14,10 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General ProjectExplorer framework that can be extended with different kind of project types. http://qt.nokia.com - - - - + + + + Verbose loading of custom wizards diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec b/src/plugins/qmldesigner/QmlDesigner.pluginspec index ce6259a947f..d5ed23992a0 100644 --- a/src/plugins/qmldesigner/QmlDesigner.pluginspec +++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -20,8 +20,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. Visual Designer for QML files. http://qt.nokia.com - - - + + + diff --git a/src/plugins/qmlinspector/QmlInspector.pluginspec b/src/plugins/qmlinspector/QmlInspector.pluginspec index 0f7c5a380d6..167791bc8a0 100644 --- a/src/plugins/qmlinspector/QmlInspector.pluginspec +++ b/src/plugins/qmlinspector/QmlInspector.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -20,11 +20,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. Debugger for QML files http://qt.nokia.com - - - - - - + + + + + + diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec b/src/plugins/qmljseditor/QmlJSEditor.pluginspec index 6e7120104fb..c57268256c6 100644 --- a/src/plugins/qmljseditor/QmlJSEditor.pluginspec +++ b/src/plugins/qmljseditor/QmlJSEditor.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Editor for QML and JavaScript. http://qt.nokia.com - - - + + + diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec index 1a1de147c36..ed69b7c5807 100644 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Qt Quick support http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec index 574f27a7fd6..734ca9b7c6f 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,12 +14,12 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Provides project type for Qt 4 pro files and tools. http://qt.nokia.com - - - - - - - + + + + + + + diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec index 3d40fd50e65..928f58f98f6 100644 --- a/src/plugins/regexp/RegExp.pluginspec +++ b/src/plugins/regexp/RegExp.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,6 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Regular Expression test widget. http://qt.nokia.com - + diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec index fdfacd217d5..e8011599381 100644 --- a/src/plugins/resourceeditor/ResourceEditor.pluginspec +++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Editor for qrc files. http://qt.nokia.com - + diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec index 7ca58f534fd..236af7c0566 100644 --- a/src/plugins/snippets/Snippets.pluginspec +++ b/src/plugins/snippets/Snippets.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,8 +13,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Code snippet plugin. http://qt.nokia.com - - - + + + diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec index d722eb7376b..f4e25fb21a1 100644 --- a/src/plugins/subversion/Subversion.pluginspec +++ b/src/plugins/subversion/Subversion.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Subversion integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec index 1cd15e057ff..eeff3ea4475 100644 --- a/src/plugins/texteditor/TextEditor.pluginspec +++ b/src/plugins/texteditor/TextEditor.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Text editor framework and the implementation of the basic text editor. http://qt.nokia.com - - - + + + diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec index f257f26a32f..2a294da60e0 100644 --- a/src/plugins/vcsbase/VCSBase.pluginspec +++ b/src/plugins/vcsbase/VCSBase.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Version Control System Base Plugin http://qt.nokia.com - - - + + + diff --git a/src/plugins/welcome/Welcome.pluginspec b/src/plugins/welcome/Welcome.pluginspec index 4cb4f989fc0..745a0227938 100644 --- a/src/plugins/welcome/Welcome.pluginspec +++ b/src/plugins/welcome/Welcome.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Default Welcome Screen Plugin http://qt.nokia.com - +