diff --git a/README b/README index 824552ed59a..2806675e8f9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Qt Creator 2.0.94 +Qt Creator 2.0.95 =============== 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 1e2c5ba77f0..96864cd3ab6 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 0b9e4260129..43139b790a1 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -39,7 +39,7 @@ \title Qt Creator Manual - \section1 Version 2.0.94 + \section1 Version 2.0.95 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 1543082d3d7..4ade11b3c44 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.2094 +qhp.QtCreator.namespace = com.nokia.qtcreator.2095 qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = Qt Creator -qhp.QtCreator.filterAttributes = qtcreator 2.0.94 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.94 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.94 +qhp.QtCreator.filterAttributes = qtcreator 2.0.95 +qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.95 +qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.95 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 6c929c4c157..4dc2e5f1fb2 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 9cea9e93974..edd65ed5ac6 100644 --- a/src/app/Info.plist +++ b/src/app/Info.plist @@ -212,8 +212,8 @@ CFBundleIdentifier com.nokia.qtcreator CFBundleVersion - 2.0.94 + 2.0.95 CFBundleShortVersionString - 2.0.94 + 2.0.95 diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index 23815082bb0..74586944ba9 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 aff528a576f..8b62efc1364 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 92ad29a81c4..abf5ccc953b 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 b00133babc5..9dc3b6cd7c0 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 3e11553aa48..65c7b470b95 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 50535072230..4fbc800cbad 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -37,7 +37,7 @@ namespace Constants { #define IDE_VERSION_MAJOR 2 #define IDE_VERSION_MINOR 0 -#define IDE_VERSION_RELEASE 94 +#define IDE_VERSION_RELEASE 95 #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 c95cbfe4ff1..006e5747af1 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 bb4083a764e..f0069431134 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 c45f9e2c4e1..c7bd234c28f 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 f2a424099af..69855d63c26 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 6a3bd1199c8..1beffa3693f 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 6d290aa4ee7..89535ac8ddc 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 f5c065b2627..2525922dd78 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 f0e53377184..a79dceeb5fa 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 ebc9f1d79c9..9303e5848c8 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 17b237a9e71..e6030ad26d1 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 441b36dab58..03f52311c4d 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 1bc691fa032..0056c126892 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 e6ccbd6583f..75783cee3ee 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 184cc14d994..0883c3fc9d5 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 0b921e9c753..9169cb24187 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 e05827bc8da..e5c3d4b9017 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 f50b2bb21b9..cbd5b7d77b9 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 a0b2add5369..2924831e76c 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 38a7ffff5e0..25c21db845f 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 5e262e02c06..cd15a9bc1c4 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 aa9c81b8f3a..d848b890674 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 c58234d4b2c..0a6749c901b 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 cfa89ea253a..b15cc9ee449 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 19dc5605577..33f3cfdd8bb 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 57d697705ff..9e4378fbf05 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 d2cd181217b..855fd926687 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 4a104415fbb..eb40c9564b3 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 19ae1a692d2..bb08f9aa2cc 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 2682f2f32e4..f9cb058868c 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 0bce1997dbe..647bbd937d6 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 - +