diff --git a/README b/README index b10ff3102bd..201d90c38ec 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Qt Creator 2.0.80 +Qt Creator 2.1.80 =============== 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 25447029a8a..1e69f880f90 100644 --- a/doc/qt-html-templates.qdocconf +++ b/doc/qt-html-templates.qdocconf @@ -16,7 +16,7 @@ HTML.postheader = "
\n" \ "
\n" \ "
\n" \ " \n" \ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 687be168e25..99e50fea7d3 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -12,7 +12,7 @@ \title Qt Creator Manual - \section1 Version 2.0.80 + \section1 Version 2.1.80 Qt Creator provides integrated tools for both application designers and developers to create applications for multiple desktop and mobile device diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index b43113be879..3e119c127f4 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.2080 +qhp.QtCreator.namespace = com.nokia.qtcreator.2180 qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = Qt Creator -qhp.QtCreator.filterAttributes = qtcreator 2.0.80 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.80 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.80 +qhp.QtCreator.filterAttributes = qtcreator 2.1.80 +qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.1.80 +qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.1.80 qhp.QtCreator.indexRoot = qhp.QtCreator.extraFiles = \ style/style.css \ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec b/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec index 8946d481a27..5e8d66806e7 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec @@ -5,6 +5,6 @@ %Description% %URL% - + diff --git a/src/app/Info.plist b/src/app/Info.plist index 36af61b2b56..2e1457eafb1 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 - 2.0.80 + 2.1.80 CFBundleShortVersionString - 2.0.80 + 2.1.80 diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index 46026e0ec2c..ff2a1a0087d 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 fa3c0942fa9..8c229e0ec73 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 6e1222c2d75..89c9d7b3800 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 ae65cb2cee8..16f1568152a 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 9bce32adc12..5e6dfec7c61 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -36,7 +36,7 @@ namespace Core { namespace Constants { #define IDE_VERSION_MAJOR 2 -#define IDE_VERSION_MINOR 0 +#define IDE_VERSION_MINOR 1 #define IDE_VERSION_RELEASE 80 #define STRINGIFY_INTERNAL(x) #x diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec index cff88e5ab65..043207f4325 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 ab6a8a42358..7e54820d769 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 d43d7b9a8cd..bc76520f15d 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 5a729848114..bc9d375ebcf 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 a396d7569a0..b42b0e94dc3 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 aa0244fe61b..2dec36ecd0b 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 30b87245c8e..ef82bccd86e 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 bcf92e73faa..7eef163f335 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 3667a23b940..1da9a29b1bd 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 0d6b2f19a70..69e19f1f461 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 7b435e7f68d..bd7af625251 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 f2058be13a5..eaaf195e1ad 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 47c683e1bc0..4f358fd12da 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 b3c1968f636..567f5858caf 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 90956c438e1..144a0e9cc1e 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 ed71982e3aa..b9f1716324c 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 2f59fbd3749..248b5170029 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 f2531d832c8..5f217f9ed11 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 8ab4e7282f6..98b11d641f5 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 c6481beacf2..819bd4f3c9b 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 b5aec34cd0b..065cc04468e 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,11 +14,11 @@ 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 00486fe352a..76c9adccd8f 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 b0fe4bf5bb4..97007126b2d 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 cf910ce9d0f..49fc23adf7c 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 60025cd9bd0..c63bd4a8f29 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 5086f05338e..bcfe6e533d0 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 5ac48dedea3..5d17483562c 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 14ecc578627..f54486f59cb 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 - +