diff --git a/doc/qtcreator-texteditor-completion.png b/doc/qtcreator-texteditor-completion.png
new file mode 100644
index 00000000000..b9affb23392
Binary files /dev/null and b/doc/qtcreator-texteditor-completion.png differ
diff --git a/doc/qtcreator-texteditor-fonts.png b/doc/qtcreator-texteditor-fonts.png
new file mode 100644
index 00000000000..ae08dfe5560
Binary files /dev/null and b/doc/qtcreator-texteditor-fonts.png differ
diff --git a/doc/qtcreator-texteditor-general.png b/doc/qtcreator-texteditor-general.png
new file mode 100644
index 00000000000..c701efbd2de
Binary files /dev/null and b/doc/qtcreator-texteditor-general.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index f9e55ba866d..ac88edd4558 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -215,8 +215,20 @@
 
     \title The Code Editor
 
-    ### SCREENSHOT of the editor in action
+    Qt Creator's code editor is designed to aid the developer to create, edit,
+    and navigate code. It is fully equipped with syntax highlighting, code
+    completion, context sensitive help, as well as inline error indicators
+    while you are typing. The screenshots below show the various dialogs within
+    which you can configure your editor.
 
+    \table
+        \row
+            \i  \inlineimage qtcreator-texteditor-general.png
+            \i  \inlineimage qtcreator-texteditor-fonts.png
+            \i  \inlineimage qtcreator-texteditor-completion.png
+    \endtable
+
+    The table below lists keyboard shortcuts supported by the code editor.
 
     \table
         \row
@@ -230,46 +242,48 @@
                 To deselect, use \key{Ctrl+Shift+U}.    
         \row
             \i  Moving lines up and down
-            \i  
+            \i  Use \key{Ctrl+Shift+Up} and \key{Ctrl+Shift+Down}
 
         \row
             \i  Completion
-            \i
+            \i  Use \key{Ctrl+Space}
 
         \row
             \i  Indenting Blocks
-            \i
-        \row
-            \i  Commenting or Uncommenting Blocks
-            \i
+            \i  Use \key{Ctrl+I}
 
         \row
-            \i  Switch between Header and Source
+            \i  Collapse
+            \i  Use \key{Ctrl+\<}
+
+        \row
+            \i  Commenting or uncommenting blocks
+            \i  Use \key{Ctrl+\/}
+
+        \row
+            \i  Delete a line
+            \i  Use \key{Shift+Del}
+
+        \row
+            \i  Switch between header file and source file
             \i  Use \key{F4}.
 
         \row
-            \i  Increasing and Decreasing Font Size
+            \i  Increasing and decreasing font size
             \i  Use \key{Ctrl+Scroll Wheel}
 
         \row
-            \i  Follow Symbols under The Cursor
+            \i  Follow symbols under the cursor
             \i  Use \key{F2} and \key{Shift+F2}. This feature works with
                 namespaces, classes, methods, variables, include statements,
                 and macros.
+
+        \row
+            \i  Switch to an external editor
+            \i  Select \gui{Open in external editor} from the
+                \gui{Edit -> Advanced} menu.
     \endtable
 
-
-    More:
-
-    Collapse
-
-    Up/Down/Page Up/Page Down - hold ctrl to prevent the cursor from moving
-
-
-
-    To switch to an external editor, select \gui{Open in external editor} from
-    the \gui{Edit -> Advanced} menu.
-
 */
 
 
@@ -1416,7 +1430,7 @@
            colons, dollar signs, hash marks etc. may cause difficulties. This
            is because some of the tools Qt Creator uses in the background have
            restrictions on the characters allowed in file and directory names.
-           To be on the safe side, we recomment creating projects and project
+           To be on the safe side, we recommend creating projects and project
            items with names consisting of plain characters, numbers,
            underscores, and hyphens.
 
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec
index 499dc23e10b..82d7d9b8630 100644
--- a/src/plugins/bineditor/BinEditor.pluginspec
+++ b/src/plugins/bineditor/BinEditor.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="BinEditor" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Binary editor component.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec
index 35f196fb9cb..0d22b8e877f 100644
--- a/src/plugins/bookmarks/Bookmarks.pluginspec
+++ b/src/plugins/bookmarks/Bookmarks.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Bookmarks" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Bookmarks in text editors.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
index 567839e781b..3818069b500 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="CMakeProjectManager" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>### TODO</license>
     <description>CMake support</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec
index e771f21ec2f..96607337182 100644
--- a/src/plugins/coreplugin/Core.pluginspec
+++ b/src/plugins/coreplugin/Core.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Core" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>The core plugin for the Qt IDE.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index a7271ec6beb..bd36c4f1c8d 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -3,10 +3,14 @@
         <file>html/images/bg_site_header_dark_grey.png</file>
         <file>html/images/body_bg_circles_bottom_right.png</file>
         <file>html/images/body_bg_gradient.png</file>
+        <file>html/images/btn_feedback.png</file>
+        <file>html/images/btn_feedback_hover.png</file>
         <file>html/images/btn_getting_started.png</file>
         <file>html/images/btn_getting_started_hover.png</file>
         <file>html/images/btn_restore_session.png</file>
         <file>html/images/btn_restore_session_hover.png</file>
+        <file>html/images/feedback-bar-background.png</file>
+        <file>html/images/feedback-text.png</file>
         <file>html/images/list_bullet_arrow.png</file>
         <file>html/images/mode_Project.png</file>
         <file>html/images/nokia_logo.png</file>
diff --git a/src/plugins/coreplugin/html/images/btn_feedback.png b/src/plugins/coreplugin/html/images/btn_feedback.png
new file mode 100644
index 00000000000..ad972b082a5
Binary files /dev/null and b/src/plugins/coreplugin/html/images/btn_feedback.png differ
diff --git a/src/plugins/coreplugin/html/images/btn_feedback_hover.png b/src/plugins/coreplugin/html/images/btn_feedback_hover.png
new file mode 100644
index 00000000000..ebf3d5754a9
Binary files /dev/null and b/src/plugins/coreplugin/html/images/btn_feedback_hover.png differ
diff --git a/src/plugins/coreplugin/html/images/feedback-bar-background.png b/src/plugins/coreplugin/html/images/feedback-bar-background.png
new file mode 100644
index 00000000000..18b3a561ffd
Binary files /dev/null and b/src/plugins/coreplugin/html/images/feedback-bar-background.png differ
diff --git a/src/plugins/coreplugin/html/images/feedback-text.png b/src/plugins/coreplugin/html/images/feedback-text.png
new file mode 100644
index 00000000000..731bdc50a32
Binary files /dev/null and b/src/plugins/coreplugin/html/images/feedback-text.png differ
diff --git a/src/plugins/coreplugin/html/images/nokia_logo.png b/src/plugins/coreplugin/html/images/nokia_logo.png
index c149f71b628..5f46512b7cc 100644
Binary files a/src/plugins/coreplugin/html/images/nokia_logo.png and b/src/plugins/coreplugin/html/images/nokia_logo.png differ
diff --git a/src/plugins/coreplugin/html/images/qt_logo.png b/src/plugins/coreplugin/html/images/qt_logo.png
index c8755ec090f..3cbfca726ba 100644
Binary files a/src/plugins/coreplugin/html/images/qt_logo.png and b/src/plugins/coreplugin/html/images/qt_logo.png differ
diff --git a/src/plugins/coreplugin/html/qt.css b/src/plugins/coreplugin/html/qt.css
index fa91bf8b931..aaba4703a0b 100644
--- a/src/plugins/coreplugin/html/qt.css
+++ b/src/plugins/coreplugin/html/qt.css
@@ -139,8 +139,31 @@ html, body {
 	margin:0;
 	padding:0;
 	width:100%;
-	height:100px;
-	margin-top:-100px;
+	height:55px;
+	margin-top:-86px;
+}
+
+.feedback-bar {
+	position:relative;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+	height: 31px;
+	width: 100%;
+	margin-top: 0px;
+	background-image: url(images/feedback-bar-background.png);
+}
+
+a.btn_feedback {
+	background-image:url(images/btn_feedback.png);
+	width:102px;
+	height:26px;
+	display:block;
+	float:left;
+}
+
+a.btn_feedback:hover {
+	background-image:url(images/btn_feedback_hover.png)
 }
 
 .left-logo {
@@ -148,13 +171,16 @@ html, body {
 	background:none;
 	margin:0;
 	padding:0;
+	padding-left: 15px;
 	content:url(images/qt_logo.png);
  }
 
 .right-logo {
 	float:right;
 	background:none;
-	margin:0;
+	margin: 0;
+	margin-right: 15px;
+	margin-top: 25px;
 	padding:0;
 	content:url(images/nokia_logo.png);
  }
diff --git a/src/plugins/coreplugin/html/welcome.html b/src/plugins/coreplugin/html/welcome.html
index 40cdafe8122..c4e47d62118 100644
--- a/src/plugins/coreplugin/html/welcome.html
+++ b/src/plugins/coreplugin/html/welcome.html
@@ -14,6 +14,8 @@
 		preloadImg01.src = "images/btn_getting_started_hover.png";
 		var preloadImg02 = new Image();
 		preloadImg02.src = "images/btn_restore_session_hover.png";
+		var preloadImg03 = new Image();
+		preloadImg03.src = "images/btn_feedback_hover.png";
 	</script>
 </head>
 <body>
@@ -73,4 +75,8 @@
 		<li class="right-logo"/>
 		<li class="left-logo"/>
 	</ul>
+	<ul class="feedback-bar">
+		<img src="images/feedback-text.png" alt="Help us make Qt Creator better" style="margin-left: 10px; margin-top: 3px; float: left;"/>
+		<a class="btn_feedback img_link" href="http://www.qtsoftware.com/forms/feedback-forms/qt-creator-user-feedback/view" style="margin-top: 3px; margin-left: 4px;">&nbsp;</a>
+	</ul>
 </body>
diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec
index 4d03eff8e3e..c98550dd2f4 100644
--- a/src/plugins/cpaster/CodePaster.pluginspec
+++ b/src/plugins/cpaster/CodePaster.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="CodePaster" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Codepaster plugin for pushing/fetching diff from server</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 4558ccaae88..f0cda5147c2 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -124,10 +124,23 @@ void CodepasterPlugin::extensionsInitialized()
         ->getObject<ProjectExplorer::ProjectExplorerPlugin>();
 }
 
+QString CodepasterPlugin::serverUrl() const
+{
+    QString url = m_settingsPage->serverUrl().toString();
+    if (url.startsWith("http://"))
+        url = url.mid(7);
+    if (url.endsWith('/'))
+        url.chop(1);
+    return url;
+}
+
 void CodepasterPlugin::post()
 {
-    if (m_poster)
+    // FIXME: The whole m_poster thing is de facto a simple function call.
+    if (m_poster) {
         delete m_poster;
+        m_poster = 0; 
+    }
     IEditor* editor = EditorManager::instance()->currentEditor();
     ITextEditor* textEditor = qobject_cast<ITextEditor*>(editor);
     if (!textEditor)
@@ -171,7 +184,8 @@ void CodepasterPlugin::post()
     data = view.getContent();
 
     // Submit to codepaster
-    m_poster = new CustomPoster(m_settingsPage->serverUrl().toString());
+
+    m_poster = new CustomPoster(serverUrl());
 
     // Copied from cpaster. Otherwise lineendings will screw up
     if (!data.contains("\r\n")) {
@@ -185,9 +199,11 @@ void CodepasterPlugin::post()
 
 void CodepasterPlugin::fetch()
 {
-    if (m_fetcher)
+    if (m_fetcher) {
         delete m_fetcher;
-    m_fetcher = new CustomFetcher(m_settingsPage->serverUrl().toString());
+        m_fetcher = 0;
+    }
+    m_fetcher = new CustomFetcher(serverUrl());
 
     QDialog dialog;
     Ui_PasteSelectDialog ui;
@@ -208,7 +224,7 @@ void CodepasterPlugin::fetch()
         return;
 
     delete m_fetcher;
-    m_fetcher = new CustomFetcher(m_settingsPage->serverUrl().toString());
+    m_fetcher = new CustomFetcher(serverUrl());
     m_fetcher->fetch(pasteID);
 }
 
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index 56c41144a96..3658169c6cb 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -70,6 +70,7 @@ public slots:
     void fetch();
 
 private:
+    QString serverUrl() const;
 
     QAction *m_postAction;
     QAction *m_fetchAction;
diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec
index c7fcd714e4f..c02dfb9625a 100644
--- a/src/plugins/cppeditor/CppEditor.pluginspec
+++ b/src/plugins/cppeditor/CppEditor.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="CppEditor" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>C/C++ editor component.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec
index 1ddf6664544..98014175363 100644
--- a/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="CppTools" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Tools for analyzing C/C++ code.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec
index b646c0bca20..719f9067538 100644
--- a/src/plugins/debugger/Debugger.pluginspec
+++ b/src/plugins/debugger/Debugger.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Debugger" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Debugger integration.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec
index 7428e6df660..9f337ea4ed3 100644
--- a/src/plugins/designer/Designer.pluginspec
+++ b/src/plugins/designer/Designer.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Designer" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Qt Designer integration.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index f403f6322f2..6d5f4a4695c 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -42,7 +42,6 @@ const char * const C_FORMEDITOR         = "Formeditor";
 const char * const T_FORMEDITOR         = "Formeditor.Toolbar";
 const char * const M_FORMEDITOR         = "Formeditor.Menu";
 const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
-const char * const C_FORMWINDOW         = "Formwindow";
 
 // Wizard type
 const char * const FORM_FILE_TYPE       = "Qt4FormFiles";
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 4ab3c61694a..ef5e3153f49 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -546,7 +546,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
         qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
 
     // Deactivate Designer if a non-form is being edited
-    if (editor && !qstrcmp(editor->kind(), Constants::C_FORMWINDOW)) {
+    if (editor && !qstrcmp(editor->kind(), Constants::C_FORMEDITOR)) {
         FormWindowEditor *fw = qobject_cast<FormWindowEditor *>(editor);
         QTC_ASSERT(fw, return);
         fw->activate();
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 65eaf8aceb1..a683dccd864 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -260,7 +260,7 @@ Core::IFile *FormWindowEditor::file()
 
 const char *FormWindowEditor::kind() const
 {
-    return C_FORMWINDOW;
+    return C_FORMEDITOR;
 }
 
 QString FormWindowEditor::displayName() const
diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec
index a420040ac8a..3c71b6bcaf6 100644
--- a/src/plugins/fakevim/FakeVim.pluginspec
+++ b/src/plugins/fakevim/FakeVim.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="FakeVim" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>VI-style keyboard navigation.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 2f0a3894328..50d45ff8769 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -180,7 +180,16 @@ bool FakeVimPluginPrivate::initialize()
 
 void FakeVimPluginPrivate::installHandler(Core::IEditor *editor)
 {
+    if (!editor)
+        return;
+
     QWidget *widget = editor->widget();
+    if (!widget)
+        return;
+
+    // we can only handle QTextEdit and QPlainTextEdit
+    if (!qobject_cast<QTextEdit *>(widget) && !qobject_cast<QPlainTextEdit *>(widget))
+        return;
     
     FakeVimHandler *handler = new FakeVimHandler(widget, widget);
 
diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec
index f0e00617e10..a454d56e5d4 100644
--- a/src/plugins/find/Find.pluginspec
+++ b/src/plugins/find/Find.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Find" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Provides the find widget and the hooks for find implementations.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec
index 21c0c39ab60..aa1ffc5242c 100644
--- a/src/plugins/git/ScmGit.pluginspec
+++ b/src/plugins/git/ScmGit.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="ScmGit" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Git integration.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec
index 54743ced9a3..e5c40f4ac6f 100644
--- a/src/plugins/helloworld/HelloWorld.pluginspec
+++ b/src/plugins/helloworld/HelloWorld.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="HelloWorld" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Hello World sample plugin.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec
index 50c5863b8c9..2e0eda7a5c6 100644
--- a/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Help" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Help system.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec
index 21df190d99a..a6c2547dbc3 100644
--- a/src/plugins/perforce/Perforce.pluginspec
+++ b/src/plugins/perforce/Perforce.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Perforce" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Perforce integration.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
index aaecd57de93..48d73c1acd6 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="ProjectExplorer" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
index c928239ed8b..bce492dd810 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Qt4ProjectManager" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Provides project type for Qt 4 pro files and tools.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 6e67989158b..4415a73209c 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -177,7 +177,10 @@ void QtVersionManager::apply()
             }
         }
     }
-    m_versions = m_widget->versions();
+    qDeleteAll(m_versions);
+    m_versions.clear();
+    foreach(QtVersion *version, m_widget->versions())
+        m_versions.append(new QtVersion(*version));
     if (versionPathsChanged)
         updateDocumentation();
     updateUniqueIdToIndexMap();
@@ -361,11 +364,16 @@ QtVersion *QtVersionManager::currentQtVersion() const
 
 QtDirWidget::QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defaultVersion)
     : QWidget(parent)
-    , m_versions(versions)
     , m_defaultVersion(defaultVersion)
     , m_specifyNameString(tr("<specify a name>"))
     , m_specifyPathString(tr("<specify a path>"))
 {
+    // Initialize m_versions
+    foreach(QtVersion *version, versions) {
+        m_versions.append(new QtVersion(*version));
+    }
+
+
     m_ui.setupUi(this);
     m_ui.qtPath->setExpectedKind(Core::Utils::PathChooser::Directory);
     m_ui.qtPath->setPromptDialogTitle(tr("Select QTDIR"));
@@ -417,6 +425,11 @@ QtDirWidget::QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defau
     updateState();
 }
 
+QtDirWidget::~QtDirWidget()
+{
+    qDeleteAll(m_versions);
+}
+
 void QtDirWidget::addQtDir()
 {
     QtVersion *newVersion = new QtVersion(m_specifyNameString, m_specifyPathString);
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index f6ccd017b67..11e5ec82359 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -122,7 +122,6 @@ private:
     // This is updated on first call to qmakeCommand
     // That function is called from updateVersionInfo()
     mutable QString m_qtVersionString;
-    Q_DISABLE_COPY(QtVersion);
 };
 
 
@@ -131,6 +130,7 @@ class QtDirWidget : public QWidget
     Q_OBJECT
 public:
     QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defaultVersion);
+    ~QtDirWidget();
     QList<QtVersion *> versions() const;
     int defaultVersion() const;
     void finish();
diff --git a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
index 1cb3129b81e..e434199ab54 100644
--- a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
+++ b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="QtScriptEditor" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Editor for QtScript.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/quickopen/QuickOpen.pluginspec
index 85d9a5cc476..74eb2a3940a 100644
--- a/src/plugins/quickopen/QuickOpen.pluginspec
+++ b/src/plugins/quickopen/QuickOpen.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="QuickOpen" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec
index e0c4ac44c20..d4255137228 100644
--- a/src/plugins/regexp/RegExp.pluginspec
+++ b/src/plugins/regexp/RegExp.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="RegExp" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Regular Expression test widget.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec
index fc7911e67cd..c46a90a8211 100644
--- a/src/plugins/resourceeditor/ResourceEditor.pluginspec
+++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="ResourceEditor" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Editor for qrc files.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec
index f7e0a18c2a0..5b0e5ecf931 100644
--- a/src/plugins/snippets/Snippets.pluginspec
+++ b/src/plugins/snippets/Snippets.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Snippets" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Code snippet plugin.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec
index 4e9c76c118d..8b87d5a7ec2 100644
--- a/src/plugins/subversion/Subversion.pluginspec
+++ b/src/plugins/subversion/Subversion.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="Subversion" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Subversion integration.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec
index 5f7d9a66ce7..06ab09c86d3 100644
--- a/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="TextEditor" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Text editor framework and the implementation of the basic text editor.</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec
index 87e3ae9eac8..60d6b72f714 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec
+++ b/src/plugins/vcsbase/VCSBase.pluginspec
@@ -1,6 +1,6 @@
 <plugin name="VCSBase" version="0.9.2" compatVersion="0.9.2">
     <vendor>Nokia Corporation</vendor>
-    <copyright>(C) 2008 Nokia Corporation</copyright>
+    <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Version Control System Base Plugin</description>
     <url>http://www.trolltech.com/</url>
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index c67f976e59c..28a30f2a03b 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -1666,7 +1666,7 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct
             }
             const QStringList mutuals = args[1].split(QLatin1Char('|'));
             const QStringList &configs = valuesDirect(QLatin1String("CONFIG"));
-            for (int i = configs.size() - 1 && ok; i >= 0; i--) {
+            for (int i = configs.size() - 1; i >= 0; i--) {
                 for (int mut = 0; mut < mutuals.count(); mut++) {
                     if (configs[i] == mutuals[mut].trimmed()) {
                         cond = (configs[i] == args[0]);
diff --git a/src/shared/qtsingleapplication/qtlocalpeer.cpp b/src/shared/qtsingleapplication/qtlocalpeer.cpp
index 4b68c67c3dd..452d43545a3 100644
--- a/src/shared/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/shared/qtsingleapplication/qtlocalpeer.cpp
@@ -94,9 +94,9 @@ bool QtLocalPeer::isClient()
     if (!lockFile.lock(QtLockedFile::WriteLock, false))
         return true;
 
+    if (!QLocalServer::removeServer(socketName))
+        qWarning("QtSingleCoreApplication: could not cleanup socket");
     bool res = server->listen(socketName);
-    if (!res && server->serverError() == QAbstractSocket::AddressInUseError)
-        res = server->listen(socketName); // ### Workaround 4.4.0tp bug
     if (!res)
         qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
     QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection()));
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 175dba7cfea..924cda99911 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -1,5 +1,5 @@
 
 DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
-INCLUDEPATH += $$PWD/../../../../shared/cplusplus
+INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus
 DEPENDPATH  += $$INCLUDEPATH .
 LIBS += -L$$PWD -lCPlusPlusTestSupport
diff --git a/tests/auto/cplusplus/shared/shared.pro b/tests/auto/cplusplus/shared/shared.pro
index 94003e3447e..2f84af560bc 100644
--- a/tests/auto/cplusplus/shared/shared.pro
+++ b/tests/auto/cplusplus/shared/shared.pro
@@ -5,4 +5,4 @@ CONFIG += static
 QT = core
 
 DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
-include($$PWD/../../../../shared/cplusplus/cplusplus.pri)
+include($$PWD/../../../../src/shared/cplusplus/cplusplus.pri)
diff --git a/tests/manual/cplusplus/cplusplus.pro b/tests/manual/cplusplus/cplusplus.pro
index 0d965b8ed0a..11dd08f6fbd 100644
--- a/tests/manual/cplusplus/cplusplus.pro
+++ b/tests/manual/cplusplus/cplusplus.pro
@@ -2,7 +2,7 @@ QT = core
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
-include(../../../shared/cplusplus/cplusplus.pri)
+include(../../../src/shared/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp