diff --git a/doc/qtcreator-texteditor-completion.png b/doc/qtcreator-texteditor-completion.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9affb233926abae16aec7a7294695f80a4cffc3
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 0000000000000000000000000000000000000000..ae08dfe5560bcbde3f77974c4c574109ce1b8225
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 0000000000000000000000000000000000000000..c701efbd2def407395a15223c5d716aae42ee75b
Binary files /dev/null and b/doc/qtcreator-texteditor-general.png differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index f9e55ba866d0909ff7144a0b46bffad57576eb73..ac88edd4558b1617f0648c354936f9a7727d27ee 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,45 +242,47 @@
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
+ \i Use \key{Ctrl+I}
+
+ \row
+ \i Collapse
+ \i Use \key{Ctrl+\<}
+
+ \row
+ \i Commenting or uncommenting blocks
+ \i Use \key{Ctrl+\/}
+
\row
- \i Commenting or Uncommenting Blocks
- \i
+ \i Delete a line
+ \i Use \key{Shift+Del}
\row
- \i Switch between Header and Source
+ \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.
- \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.
+ \row
+ \i Switch to an external editor
+ \i Select \gui{Open in external editor} from the
+ \gui{Edit -> Advanced} menu.
+ \endtable
*/
@@ -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 499dc23e10be7308fad35662934eca0d8b309ef6..82d7d9b863002095fe3dbd92737e278f70f422eb 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 35f196fb9cb8c930d58a10c7cc7c85699fa2ece1..0d22b8e877fcf99be42bf9a742cca1292cdfede9 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 567839e781bfaeb23c69f5b91198afffbe7e3724..3818069b50068be1689f916697ec120fa31b4c27 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 e771f21ec2f7f4589789f1d3106caef94a9e1525..96607337182406c9b6c85c3af2bd71f802dae1ea 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 a7271ec6bebfb1997197ec77032d3ba166e194e4..bd36c4f1c8d6112710c7549535e5b35bd878ea9a 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 0000000000000000000000000000000000000000..ad972b082a56619913a3255af5d75d84329957b7
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 0000000000000000000000000000000000000000..ebf3d5754a9e3fba83875664d8327f805216d94a
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 0000000000000000000000000000000000000000..18b3a561ffd9aa91d85543b43872c2b08e564c3e
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 0000000000000000000000000000000000000000..731bdc50a322c6153ed760cb7ca8d6a8b59b010c
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 c149f71b628c82587cee2c715c66868b51bc6c31..5f46512b7ccc6e8a827f1854e1dfd2717320b17c 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 c8755ec090fc92b6a99a20252be56a011e02817a..3cbfca726baf677b15ab6ca4231c21159acb0478 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 fa91bf8b9318bce0d422ebdc0f6ae54a3f76232e..aaba4703a0bd08592eb4d886af489df6850b9e51 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 40cdafe81228a82372dc2eace6c6534f1ef13f9f..c4e47d62118a76b10c06e9800760f97055c50bc2 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;"> </a>
+ </ul>
</body>
diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec
index 4d03eff8e3ef8c884603f3fa02663dbe20464436..c98550dd2f40423446883aa27c0afd4daa7ee7f6 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 4558ccaae88e3ed544085ffdc24bec71574ac873..f0cda5147c2eed82ed7969c63e8d206611a041e8 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 56c41144a96e7882c0636f5837020ff931d97b90..3658169c6cbbd04c0ac975c050b651871d769273 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 c7fcd714e4f46a19add1e1c0f2586b7c9d673f4c..c02dfb9625a1d51a870843fb9dbaaece26cf2362 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 1ddf66645445b390c52acb736b9bdd93565406f1..98014175363545a8e1ccaad362ba36443023c11e 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 b646c0bca2027f51f5a657fc1437a12536efb5b2..719f90675381bebe8312cbf375e1fd9c5de67a04 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 7428e6df6603910520dced12d9824aa4ef088ad6..9f337ea4ed37a21271209cd3bcdf9d3c90949248 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 f403f6322f2e238492e0207799e3587b8bf04909..6d5f4a4695ceeb09a7cef16d4b8fe78f4eb1304f 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 4ab3c61694accbd89298c74d3eae5873326b4f00..ef5e3153f49fa576d68a227164889c5a45093931 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 65eaf8aceb119820df4bc73102e989bf01903704..a683dccd86451d2a560199880fad483a34d276f4 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 a420040ac8a8d8a39c572902d5c8aa191e084781..3c71b6bcaf6ceeee8da0edad953d717eac7801e2 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 2f0a389432874ef598a95eb0c5d57dc4fe2d3afd..50d45ff8769f1731c67317ca938dca7be727a9fd 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 f0e00617e10a41aa35cfd013e921f93f1a6c4bbf..a454d56e5d46835c33b2daedf7f1bc072342eb31 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 21c0c39ab60b76d0b100155091a6128993c006a1..aa1ffc5242c1ee67c290f2b62d9fbded74adeaaf 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 54743ced9a3ee4bc91b70fe2a7b878f96dff2e37..e5c40f4ac6fada531daec53871fe175217f4ca94 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 50c5863b8c9ad356f986e57e95818c37f6359a4a..2e0eda7a5c6b98344b02568c15bdf6694fde9695 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 21df190d99a19344698994eed9e9d3522a733ebc..a6c2547dbc37a42daf0b2c268511a9f0f553aded 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 aaecd57de93cc54616887fd2e90df5bc1b06aaaa..48d73c1acd623bd98bf4ff4ce85303c7a0255a7f 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 c928239ed8b3af5d820656f5afeb380a0e53d607..bce492dd8105a889601e62cf8e726c5bcdeae31c 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 6e67989158b6424f4da2f06c0bc1591016eb471e..4415a73209c396e1025d97cf0865364c1cbcc004 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 f6ccd017b67e7edd9cd16548e06cfd967d3604d1..11e5ec8235922558fc83d9582fab762c77c18c2e 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 1cb3129b81e9949cf4fd37a9d4868c5b50479802..e434199ab54731376e33c2bb417e64f0f52ea5cf 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 85d9a5cc4761fdcc35d4ff0b88b41fa4cd77149a..74eb2a3940a2bb147b13d121a611298d64a70b00 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 e0c4ac44c20cebb559b2ecedab379a9263c8c0c0..d42551372285fc7f52c30849e18371cdab318298 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 fc7911e67cd55e4185c7b4a0f071c5d462d466f7..c46a90a8211e1e0bf8b26d13464be08fc8abc4c4 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 f7e0a18c2a0280b8c65515fe8b211db8e9314782..5b0e5ecf931028c67885760c7b2878ac7059b765 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 4e9c76c118deea7e9b10883b8d1642afbdf13f4a..8b87d5a7ec2629c3ec49773a7ee12f8a37b80c98 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 5f7d9a66ce71a4cb1ea3d1e2f3f99ef5c5870d1b..06ab09c86d39de2d0ce06eb315343063780c7d5e 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 87e3ae9eac8268c08a888c67a27c9e97f779fbfa..60d6b72f7141e3639919faf6f3e4d3a81c09e417 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 c67f976e59c8cbb87d006e794e008d136914ae30..28a30f2a03b9e5df879641aa46931a8c09cf7211 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 4b68c67c3dd8b99c2bd6644056d15f49ac1d4651..452d43545a30d859f859baa085fce1b26572638b 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 175dba7cfeae42b2bd4232d8c504e5adc26df386..924cda99911af638da1fddff3ca5219825940a06 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 94003e3447e5858930df128f9d7faa34cb1851d0..2f84af560bcdf0a8a2704b83a5a3cb19e0a4c7db 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 0d965b8ed0aea1f4eaf8a05cefda58e9ae033dad..11dd08f6fbdb90fce1efda55d15d6ae4f9f195be 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