diff --git a/README b/README index 0bf72533022..83ee26c0746 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Qt Creator 2.0.91 +Qt Creator 2.1.81 =============== 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 9af13c63316..ac94225b461 100644 --- a/doc/qt-html-templates.qdocconf +++ b/doc/qt-html-templates.qdocconf @@ -21,7 +21,7 @@ HTML.postheader = "
\n" \ "
\n" \ "
\n" \ " \n" \ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index b6946b4b90b..d5a26cd215b 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -39,7 +39,7 @@ \title Qt Creator Manual - \section1 Version 2.0.91 + \section1 Version 2.1.81 Qt Creator provides a cross-platform, complete integrated development environment (IDE) for application developers to create applications for diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 7ea988596da..6672a40903c 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -20,12 +20,12 @@ sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressb qhp.projects = QtCreator qhp.QtCreator.file = qtcreator.qhp -qhp.QtCreator.namespace = com.nokia.qtcreator.2091 +qhp.QtCreator.namespace = com.nokia.qtcreator.2181 qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = Qt Creator -qhp.QtCreator.filterAttributes = qtcreator 2.0.91 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.91 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.91 +qhp.QtCreator.filterAttributes = qtcreator 2.1.81 +qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.1.81 +qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.1.81 qhp.QtCreator.indexRoot = qhp.QtCreator.extraFiles = style/style.css \ style/style_ie6.css \ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec b/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec index 60e6f8df4a5..c7c5e2f5e92 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 8dc51bdf572..ce122da3a21 100644 --- a/src/app/Info.plist +++ b/src/app/Info.plist @@ -212,8 +212,8 @@ CFBundleIdentifier com.nokia.qtcreator CFBundleVersion - 2.0.91 + 2.1.81 CFBundleShortVersionString - 2.0.91 + 2.1.81 diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index a34d8ba60bb..0755010e756 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 3420f3b26d4..9c659c274b6 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/classview/ClassView.pluginspec b/src/plugins/classview/ClassView.pluginspec index c3471974f3c..77f76573948 100644 --- a/src/plugins/classview/ClassView.pluginspec +++ b/src/plugins/classview/ClassView.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Denis Mingulov @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Class View component. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec index 1e019d2520f..14aac19a504 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 64b3627c337..6ca42b8d805 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 42f167dd155..c1fbb3e40f2 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -36,8 +36,8 @@ namespace Core { namespace Constants { #define IDE_VERSION_MAJOR 2 -#define IDE_VERSION_MINOR 0 -#define IDE_VERSION_RELEASE 91 +#define IDE_VERSION_MINOR 1 +#define IDE_VERSION_RELEASE 81 #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 8805039846e..eb895cb542f 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 ad94a1b9415..9c2a2b1601c 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 c473d1af8a1..b62c9e5dff1 100644 --- a/src/plugins/cpptools/CppTools.pluginspec +++ b/src/plugins/cpptools/CppTools.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 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 13da091139b..47e49e4686f 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 7fc9b7a149d..d2050b61278 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 acc3a5823e2..973cd7931c0 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 ec1aa495c75..d68f79f5090 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 2ac0f2475ec..d9263df3f60 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 46f5e2e0109..701af3455e6 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 82e8b8b099c..f1a87589de4 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 40b8a493a70..f2b06679bd0 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 aa1238ac0d9..fc80949bf40 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/imageviewer/ImageViewer.pluginspec b/src/plugins/imageviewer/ImageViewer.pluginspec index 3f4c6933b00..d4a01b07280 100644 --- a/src/plugins/imageviewer/ImageViewer.pluginspec +++ b/src/plugins/imageviewer/ImageViewer.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Denis Mingulov @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Image Viewer component. http://qt.nokia.com - + diff --git a/src/plugins/locator/Locator.pluginspec b/src/plugins/locator/Locator.pluginspec index 45e30fee4a7..96ca3145d6b 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 8db3981264a..473be1f4885 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 7914a3835f3..7229d18ce9a 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 0d520466f9d..dceb7753724 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 4dc9992c0f1..b6a2cca6b73 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/qmljseditor/QmlJSEditor.pluginspec b/src/plugins/qmljseditor/QmlJSEditor.pluginspec index 42f5dd2cd85..adc6a03345b 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/qmljsinspector/QmlJSInspector.pluginspec b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec index f5fa841291b..712c90be5d1 100644 --- a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec +++ b/src/plugins/qmljsinspector/QmlJSInspector.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/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec index 53ae57078a1..8e7d1a909d2 100644 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.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 Qt Quick support http://qt.nokia.com - - - - - + + + + + diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec index b53e43c97c2..e496addf836 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 d428912ecd1..d23b473d7ad 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 7a5905f004a..e7ecf2eeda7 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 8cca42007de..83d38cc0c0d 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 87ab8a7747f..67e1e264938 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/tasklist/TaskList.pluginspec b/src/plugins/tasklist/TaskList.pluginspec index 5115be8c346..b1a8eca3e4a 100644 --- a/src/plugins/tasklist/TaskList.pluginspec +++ b/src/plugins/tasklist/TaskList.pluginspec @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,7 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Use .tasks-files to populate the build issues view. http://qt.nokia.com - - + + diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec index b366d51c51a..1670ce1ca40 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 341c6ce27b3..ee142de6c03 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 386d92fcaa4..1b4c17425c2 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 - +