From 1ebb72b47f95bf34da6b3dc9883366e642849058 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Tue, 11 Feb 2020 14:30:19 +0100
Subject: [PATCH 01/10] Squish: Update expected tooltips

Change-Id: I88c5757b1f3beda34773ec3738779094a8441c2f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 tests/system/suite_editors/tst_qml_editor/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py
index 633e9fcbdc1..56179134cbd 100644
--- a/tests/system/suite_editors/tst_qml_editor/test.py
+++ b/tests/system/suite_editors/tst_qml_editor/test.py
@@ -157,7 +157,7 @@ def testHovering():
     if JIRA.isBugStillOpen(20020):
         expectedValues[0] = {'text':'<table><tr><td valign=middle>Rectangle</td><td>&nbsp;&nbsp;'
                              '<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'}
-        alternativeValues[0] = {"text":"<p>Rectangle</p>"}
+        alternativeValues[0] = {"text":"Rectangle"}
     verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues, alternativeValues)
     test.log("Testing hovering expressions")
     openDocument(focusDocumentPath % "focus\\.qml")
@@ -174,5 +174,5 @@ def testHovering():
     additionalKeyPresses = ["<Left>", "<Left>", "<Left>", "<Left>"]
     expectedTypes = ["ColorTip", "TextTip"]
     expectedValues = ["#D1DBBD", {"text":'<table><tr><td valign=middle>number</td><td>&nbsp;&nbsp;<img src=":/utils/tooltip/images/f1.png"></td></tr></table>'}]
-    alternativeValues = ["#D6DBBD", {"text":"<p>number</p>"}]
+    alternativeValues = ["#D6DBBD", {"text":"number"}]
     verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues, alternativeValues)

From 1b2aa56f15ca27e0e8760875fd1ff9accbe9717e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 9 Oct 2019 23:30:19 +0300
Subject: [PATCH 02/10] Git: Add grep and pickaxe filters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: QTCREATORBUG-22512
Change-Id: I98eed9a7f9da15e163804a0fd81713149a06c5b0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/git/gitclient.cpp                | 12 ++++-
 src/plugins/git/giteditor.cpp                | 45 +++++++++++++++-
 src/plugins/git/giteditor.h                  | 10 ++++
 src/plugins/git/gitplugin.cpp                | 54 +++++++++++++++++++-
 src/plugins/vcsbase/basevcseditorfactory.cpp |  9 ++--
 5 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 525fca7aba3..7ba46935dba 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -999,8 +999,9 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName,
     const QString title = tr("Git Log \"%1\"").arg(msgArg);
     const Id editorId = Git::Constants::GIT_LOG_EDITOR_ID;
     const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName);
-    VcsBaseEditorWidget *editor = createVcsEditor(editorId, title, sourceFile,
-                                                  codecFor(CodecLogOutput), "logTitle", msgArg);
+    GitEditorWidget *editor = static_cast<GitEditorWidget *>(
+                createVcsEditor(editorId, title, sourceFile,
+                                codecFor(CodecLogOutput), "logTitle", msgArg));
     VcsBaseEditorConfig *argWidget = editor->editorConfig();
     if (!argWidget) {
         argWidget = new GitLogArgumentsWidget(settings(), !fileName.isEmpty(), editor->toolBar());
@@ -1018,6 +1019,13 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName,
         arguments << "-n" << QString::number(logCount);
 
     arguments << argWidget->arguments();
+    const QString grepValue = editor->grepValue();
+    if (!grepValue.isEmpty())
+        arguments << "--grep=" + grepValue;
+
+    const QString pickaxeValue = editor->pickaxeValue();
+    if (!pickaxeValue.isEmpty())
+        arguments << "-S" << pickaxeValue;
 
     if (!fileName.isEmpty())
         arguments << "--" << fileName;
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 78b8389da18..d9c29afebf4 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -35,10 +35,11 @@
 #include "githighlighters.h"
 
 #include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
-#include <vcsbase/vcsoutputwindow.h>
 #include <texteditor/textdocument.h>
+#include <vcsbase/vcsbaseeditorconfig.h>
+#include <vcsbase/vcsoutputwindow.h>
 
+#include <utils/qtcassert.h>
 #include <utils/temporaryfile.h>
 
 #include <QMenu>
@@ -380,5 +381,45 @@ QString GitEditorWidget::sourceWorkingDirectory() const
     return path.toString();
 }
 
+void GitEditorWidget::lineEditChanged()
+{
+    if (VcsBaseEditorConfig *config = editorConfig())
+        config->handleArgumentsChanged();
+}
+
+void GitEditorWidget::refreshOnLineEdit(Utils::FancyLineEdit *lineEdit)
+{
+    connect(lineEdit, &QLineEdit::returnPressed,
+            this, &GitEditorWidget::lineEditChanged);
+    connect(lineEdit, &Utils::FancyLineEdit::rightButtonClicked,
+            this, &GitEditorWidget::lineEditChanged);
+}
+
+void GitEditorWidget::setGrepLineEdit(Utils::FancyLineEdit *lineEdit)
+{
+    m_grepLineEdit = lineEdit;
+    refreshOnLineEdit(lineEdit);
+}
+
+void GitEditorWidget::setPickaxeLineEdit(Utils::FancyLineEdit *lineEdit)
+{
+    m_pickaxeLineEdit = lineEdit;
+    refreshOnLineEdit(lineEdit);
+}
+
+QString GitEditorWidget::grepValue() const
+{
+    if (!m_grepLineEdit)
+        return QString();
+    return m_grepLineEdit->text();
+}
+
+QString GitEditorWidget::pickaxeValue() const
+{
+    if (!m_pickaxeLineEdit)
+        return QString();
+    return m_pickaxeLineEdit->text();
+}
+
 } // namespace Internal
 } // namespace Git
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h
index a23a4fe76d3..bc7df7fe9e6 100644
--- a/src/plugins/git/giteditor.h
+++ b/src/plugins/git/giteditor.h
@@ -29,6 +29,8 @@
 
 #include <QRegExp>
 
+namespace Utils { class FancyLineEdit; }
+
 namespace Git {
 namespace Internal {
 
@@ -40,6 +42,10 @@ public:
     GitEditorWidget();
 
     void setPlainText(const QString &text) override;
+    void setGrepLineEdit(Utils::FancyLineEdit *lineEdit);
+    void setPickaxeLineEdit(Utils::FancyLineEdit *lineEdit);
+    QString grepValue() const;
+    QString pickaxeValue() const;
 
 private:
     void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert);
@@ -59,9 +65,13 @@ private:
     bool supportChangeLinks() const override;
     QString fileNameForLine(int line) const override;
     QString sourceWorkingDirectory() const;
+    void refreshOnLineEdit(Utils::FancyLineEdit *lineEdit);
+    void lineEditChanged();
 
     mutable QRegExp m_changeNumberPattern;
     QString m_currentChange;
+    Utils::FancyLineEdit *m_grepLineEdit = nullptr;
+    Utils::FancyLineEdit *m_pickaxeLineEdit = nullptr;
 };
 
 } // namespace Git
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index a4731b07b7b..b04db69e94f 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -54,11 +54,13 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/locator/commandlocator.h>
+#include <coreplugin/messagebox.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/navigationwidget.h>
 #include <coreplugin/vcsmanager.h>
 
-#include <coreplugin/messagebox.h>
+#include <aggregation/aggregate.h>
+#include <utils/fancylineedit.h>
 #include <utils/parameteraction.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
@@ -83,7 +85,9 @@
 #include <QAction>
 #include <QApplication>
 #include <QFileDialog>
+#include <QHBoxLayout>
 #include <QMenu>
+#include <QVBoxLayout>
 
 #ifdef WITH_TESTS
 #include <QTest>
@@ -125,6 +129,52 @@ private:
     GitClient *m_client;
 };
 
+class GitLogEditorWidget : public QWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Git::Internal::GitLogEditorWidget);
+public:
+    GitLogEditorWidget()
+    {
+        auto gitEditor = new GitEditorWidget;
+        auto vlayout = new QVBoxLayout;
+        auto hlayout = new QHBoxLayout;
+        vlayout->setSpacing(0);
+        vlayout->setContentsMargins(0, 0, 0, 0);
+        auto grepLineEdit = addLineEdit(tr("Filter by message"),
+                                        tr("Filter log entries by text in the commit message."));
+        auto pickaxeLineEdit = addLineEdit(tr("Filter by content"),
+                                           tr("Filter log entries by added or removed string."));
+        hlayout->setSpacing(20);
+        hlayout->setContentsMargins(0, 0, 0, 0);
+        hlayout->addWidget(new QLabel(tr("Filter:")));
+        hlayout->addWidget(grepLineEdit);
+        hlayout->addWidget(pickaxeLineEdit);
+        hlayout->addStretch();
+        vlayout->addLayout(hlayout);
+        vlayout->addWidget(gitEditor);
+        setLayout(vlayout);
+        gitEditor->setGrepLineEdit(grepLineEdit);
+        gitEditor->setPickaxeLineEdit(pickaxeLineEdit);
+
+        auto textAgg = Aggregation::Aggregate::parentAggregate(gitEditor);
+        auto agg = textAgg ? textAgg : new Aggregation::Aggregate;
+        agg->add(this);
+        agg->add(gitEditor);
+        setFocusProxy(gitEditor);
+    }
+
+private:
+    FancyLineEdit *addLineEdit(const QString &placeholder, const QString &tooltip)
+    {
+        auto lineEdit = new FancyLineEdit;
+        lineEdit->setFiltering(true);
+        lineEdit->setToolTip(tooltip);
+        lineEdit->setPlaceholderText(placeholder);
+        lineEdit->setMaximumWidth(200);
+        return lineEdit;
+    }
+};
+
 const unsigned minimumRequiredVersion = 0x010900;
 
 const VcsBaseSubmitEditorParameters submitParameters {
@@ -346,7 +396,7 @@ public:
 
     VcsEditorFactory logEditorFactory {
         &logEditorParameters,
-        [] { return new GitEditorWidget; },
+        [] { return new GitLogEditorWidget; },
         std::bind(&GitPluginPrivate::describe, this, _1, _2)
     };
 
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp
index 13346949cfe..12f467afa05 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcseditorfactory.cpp
@@ -71,10 +71,11 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters,
         return document;
     });
 
-    setEditorWidgetCreator([parameters, editorWidgetCreator, describeFunc]() -> TextEditorWidget * {
-        auto widget = qobject_cast<VcsBaseEditorWidget *>(editorWidgetCreator());
-        widget->setDescribeFunc(describeFunc);
-        widget->setParameters(parameters);
+    setEditorWidgetCreator([parameters, editorWidgetCreator, describeFunc]() {
+        auto widget = editorWidgetCreator();
+        auto editorWidget = Aggregation::query<VcsBaseEditorWidget>(widget);
+        editorWidget->setDescribeFunc(describeFunc);
+        editorWidget->setParameters(parameters);
         return widget;
     });
 

From 4960b2ac2a0e554cb7a0f3ffb08e3fd29e58e092 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Mon, 17 Feb 2020 13:51:33 +0100
Subject: [PATCH 03/10] Android: Use FilePath::fromUserInput for user input

... or when reading non-Qt config files. FilePath::fromString would make
FilePath keep native dir delimiters, which would cause wrong negatives
for example in FilePath::isChildOf().

This change here fixes that AndroidToolChain:::isValid incorrectly
returned true.

Change-Id: I28b321fe3c4064f61b78dc7fc36b8af3d18b806c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/android/androidsettingswidget.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index d34f3c4ab9c..bd7b1add50f 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -538,7 +538,7 @@ Utils::FilePath AndroidSettingsWidget::findJdkInCommonPaths()
 {
     QString jdkFromEnvVar = QString::fromLocal8Bit(getenv("JAVA_HOME"));
     if (!jdkFromEnvVar.isEmpty())
-        return Utils::FilePath::fromString(jdkFromEnvVar);
+        return Utils::FilePath::fromUserInput(jdkFromEnvVar);
 
     if (Utils::HostOsInfo::isWindowsHost()) {
         QString jdkRegisteryPath = "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\JDK\\";
@@ -549,7 +549,7 @@ Utils::FilePath AndroidSettingsWidget::findJdkInCommonPaths()
 
         for (const QString &version : jdkVersions) {
             jdkSettings.beginGroup(version);
-            jdkHome = Utils::FilePath::fromString(jdkSettings.value("JavaHome").toString());
+            jdkHome = Utils::FilePath::fromUserInput(jdkSettings.value("JavaHome").toString());
             jdkSettings.endGroup();
             if (version.startsWith("1.8"))
                 return jdkHome;
@@ -583,7 +583,7 @@ Utils::FilePath AndroidSettingsWidget::findJdkInCommonPaths()
 
 void AndroidSettingsWidget::validateNdk()
 {
-    auto ndkPath = Utils::FilePath::fromString(m_ui->ndkListComboBox->currentText());
+    auto ndkPath = Utils::FilePath::fromUserInput(m_ui->ndkListComboBox->currentText());
     m_androidConfig.setNdkLocation(ndkPath);
 
     auto summaryWidget = static_cast<SummaryWidget *>(m_ui->androidDetailsWidget->widget());
@@ -612,7 +612,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
 
 void AndroidSettingsWidget::validateSdk()
 {
-    auto sdkPath = Utils::FilePath::fromString(m_ui->SDKLocationPathChooser->rawPath());
+    auto sdkPath = Utils::FilePath::fromUserInput(m_ui->SDKLocationPathChooser->rawPath());
     m_androidConfig.setSdkLocation(sdkPath);
 
     auto summaryWidget = static_cast<SummaryWidget *>(m_ui->androidDetailsWidget->widget());

From 30359f725e722114c2f7feb9b7fdb8e3e9e5919c Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Sun, 16 Feb 2020 21:16:41 +0100
Subject: [PATCH 04/10] OutputWindow: Reduce scope of local variable

Found by cppcheck.

Change-Id: I597021ddb3317cf6320bf25eb2d52141fa1e4f80
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/coreplugin/outputwindow.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index 4d70830ccec..3c7941ba6fc 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -439,14 +439,13 @@ void OutputWindow::appendMessage(const QString &output, OutputFormat format)
         if (sameLine) {
             d->scrollToBottom = true;
 
-            int newline = -1;
             bool enforceNewline = d->enforceNewline;
             d->enforceNewline = false;
 
             if (enforceNewline) {
                 out.prepend('\n');
             } else {
-                newline = out.indexOf(QLatin1Char('\n'));
+                const int newline = out.indexOf(QLatin1Char('\n'));
                 moveCursor(QTextCursor::End);
                 if (newline != -1) {
                     if (d->formatter)

From fff7e32877f11a4a6e0f07a8030f3c9d5eac5584 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Mon, 17 Feb 2020 14:46:04 +0100
Subject: [PATCH 05/10] OutputWindow: Cleanup and modernize

Change-Id: Ie78c84e2677cabb144cfc678e5d1007fcae1f33a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/coreplugin/outputwindow.cpp | 14 +++++++-------
 src/plugins/coreplugin/outputwindow.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index 3c7941ba6fc..149c7189fdb 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -49,7 +49,7 @@ namespace Internal {
 class OutputWindowPrivate
 {
 public:
-    OutputWindowPrivate(QTextDocument *document)
+    explicit OutputWindowPrivate(QTextDocument *document)
         : cursor(document)
     {
     }
@@ -159,7 +159,7 @@ OutputWindow::~OutputWindow()
     delete d;
 }
 
-void OutputWindow::mousePressEvent(QMouseEvent * e)
+void OutputWindow::mousePressEvent(QMouseEvent *e)
 {
     d->mouseButtonPressed = e->button();
     QPlainTextEdit::mousePressEvent(e);
@@ -369,11 +369,11 @@ QString OutputWindow::doNewlineEnforcement(const QString &out)
     d->scrollToBottom = true;
     QString s = out;
     if (d->enforceNewline) {
-        s.prepend(QLatin1Char('\n'));
+        s.prepend('\n');
         d->enforceNewline = false;
     }
 
-    if (s.endsWith(QLatin1Char('\n'))) {
+    if (s.endsWith('\n')) {
         d->enforceNewline = true; // make appendOutputInline put in a newline next time
         s.chop(1);
     }
@@ -445,7 +445,7 @@ void OutputWindow::appendMessage(const QString &output, OutputFormat format)
             if (enforceNewline) {
                 out.prepend('\n');
             } else {
-                const int newline = out.indexOf(QLatin1Char('\n'));
+                const int newline = out.indexOf('\n');
                 moveCursor(QTextCursor::End);
                 if (newline != -1) {
                     if (d->formatter)
@@ -457,7 +457,7 @@ void OutputWindow::appendMessage(const QString &output, OutputFormat format)
             if (out.isEmpty()) {
                 d->enforceNewline = true;
             } else {
-                if (out.endsWith(QLatin1Char('\n'))) {
+                if (out.endsWith('\n')) {
                     d->enforceNewline = true;
                     out.chop(1);
                 }
@@ -500,7 +500,7 @@ void OutputWindow::appendText(const QString &textIn, const QTextCharFormat &form
         tmp.setFontWeight(QFont::Bold);
         d->cursor.insertText(doNewlineEnforcement(tr("Additional output omitted. You can increase "
                                                      "the limit in the \"Build & Run\" settings.")
-                                                  + QLatin1Char('\n')), tmp);
+                                                  + '\n'), tmp);
     }
 
     d->cursor.endEditBlock();
diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
index 8490caa5d49..509ae6dfab0 100644
--- a/src/plugins/coreplugin/outputwindow.h
+++ b/src/plugins/coreplugin/outputwindow.h
@@ -109,7 +109,7 @@ private:
     QString doNewlineEnforcement(const QString &out);
     void filterNewContent();
 
-    Internal::OutputWindowPrivate *d;
+    Internal::OutputWindowPrivate *d = nullptr;
 };
 
 } // namespace Core

From da42176da8401855688c333f02b583e8154aa95f Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Mon, 17 Feb 2020 14:30:13 +0100
Subject: [PATCH 06/10] QmlPuppet: Fix unused parameter warnings

Change-Id: I3bd5f921a3ca1f6067fac6e232f383f0b1be5463
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../qt5informationnodeinstanceserver.cpp          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 4af404869ad..a30f972025e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -348,6 +348,8 @@ void Qt5InformationNodeInstanceServer::handleView3DDestroyed(QObject *obj)
     removeNode3D(view->scene());
     if (view && view == m_active3DView)
         m_active3DView = nullptr;
+#else
+    Q_UNUSED(obj)
 #endif
 }
 
@@ -362,6 +364,8 @@ void Qt5InformationNodeInstanceServer::handleNode3DDestroyed(QObject *obj)
                                   Q_ARG(QVariant, objectToVariant(obj)));
     }
     removeNode3D(obj);
+#else
+    Q_UNUSED(obj)
 #endif
 }
 
@@ -656,6 +660,8 @@ QObject *Qt5InformationNodeInstanceServer::findView3DForInstance(const ServerNod
         if (view && sceneRoot == view->importScene())
             return view3D;
     }
+#else
+    Q_UNUSED(instance)
 #endif
     return {};
 }
@@ -676,6 +682,8 @@ QObject *Qt5InformationNodeInstanceServer::findView3DForSceneRoot(QObject *scene
                 return view3D;
         }
     }
+#else
+    Q_UNUSED(sceneRoot)
 #endif
     return {};
 }
@@ -743,6 +751,8 @@ QObject *Qt5InformationNodeInstanceServer::find3DSceneRoot(const ServerNodeInsta
             }
         }
     }
+#else
+    Q_UNUSED(instance)
 #endif
     return nullptr;
 }
@@ -759,6 +769,8 @@ QObject *Qt5InformationNodeInstanceServer::find3DSceneRoot(QObject *obj) const
         if (view && view->scene() == obj)
             return obj;
     }
+#else
+    Q_UNUSED(obj)
 #endif
     // Some other non-instance object, assume it's not part of any scene
     return nullptr;
@@ -800,6 +812,9 @@ void Qt5InformationNodeInstanceServer::setup3DEditView(const QList<ServerNodeIns
 
         createCameraAndLightGizmos(instanceList);
     }
+#else
+    Q_UNUSED(instanceList)
+    Q_UNUSED(toolStates)
 #endif
 }
 

From 4205134847da5cbb7ef766622688d74cc3be947b Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Mon, 17 Feb 2020 09:08:48 +0100
Subject: [PATCH 07/10] Squish: Fix compiler toolchains on macOS

Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
---
 .../settings/mac/QtProject/qtcreator/toolchains.xml  | 12 ++++++------
 tests/system/shared/qtcreator.py                     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
index 411027599df..ac3136362c7 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
@@ -9,7 +9,7 @@
    <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
     <value type="QString">x86-linux-generic-elf-64bit</value>
     <value type="QString">x86-linux-generic-elf-32bit</value>
-    <value type="QString">x86-macos-generic-mach_o-64bit</value>
+    <value type="QString">x86-darwin-generic-mach_o-64bit</value>
    </valuelist>
    <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
    <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
@@ -23,8 +23,8 @@
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value>
    <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
-    <value type="QString">x86-macos-generic-mach_o-64bit</value>
-    <value type="QString">x86-macos-generic-mach_o-32bit</value>
+    <value type="QString">x86-darwin-generic-mach_o-64bit</value>
+    <value type="QString">x86-darwin-generic-mach_o-32bit</value>
    </valuelist>
    <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
    <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
@@ -38,8 +38,8 @@
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value>
    <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
-    <value type="QString">x86-macos-generic-mach_o-64bit</value>
-    <value type="QString">x86-macos-generic-mach_o-32bit</value>
+    <value type="QString">x86-darwin-generic-mach_o-64bit</value>
+    <value type="QString">x86-darwin-generic-mach_o-32bit</value>
    </valuelist>
    <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
    <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
@@ -55,7 +55,7 @@
    <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
     <value type="QString">x86-linux-generic-elf-64bit</value>
     <value type="QString">x86-linux-generic-elf-32bit</value>
-    <value type="QString">x86-macos-generic-mach_o-64bit</value>
+    <value type="QString">x86-darwin-generic-mach_o-64bit</value>
    </valuelist>
    <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
    <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 295a9ed2cff..76dbd7071d6 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -212,7 +212,7 @@ def __guessABI__(supportedABIs, use64Bit):
     if platform.system() == 'Linux':
         supportedABIs = filter(lambda x: 'linux' in x, supportedABIs)
     elif platform.system() == 'Darwin':
-        supportedABIs = filter(lambda x: 'macos' in x, supportedABIs)
+        supportedABIs = filter(lambda x: 'darwin' in x, supportedABIs)
     if use64Bit:
         searchFor = "64bit"
     else:

From 086b4eef07f44f9bbc4b1e65ed158616a7b39ed6 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 14 Feb 2020 16:48:22 +0100
Subject: [PATCH 08/10] Plugin wizard: Enable building against Qt Creator
 snapshots in github workflow

Change-Id: I36a6ffb878c5bc6a59219424cab5b71bdc12bf33
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 .../wizards/qtcreatorplugin/github_workflow_README.md  |  8 ++++----
 .../qtcreatorplugin/github_workflow_build_qmake.yml    | 10 ++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md
index d4019e46440..8481ed15ae9 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_README.md
@@ -16,7 +16,10 @@ The value for `QT_VERSION` specifies the Qt version to use for building the plug
 
 The value for `QT_CREATOR_VERSION` specifies the Qt Creator version to use for building the plugin.
 
-You need to keep these two values updated for different versions of your plugin, and take care
+The value for `QT_CREATOR_SNAPSHOT` can either be `NO` or `latest` or the build ID of a specific
+snapshot build for the Qt Creator version that you specified.
+
+You need to keep these values updated for different versions of your plugin, and take care
 that the Qt version and Qt Creator version you specify are compatible.
 
 ## What it does
@@ -35,7 +38,4 @@ The build job consists of several steps:
 If your plugin requires additional resources besides the plugin library, you need to adapt the
 script accordingly.
 
-Only released versions of Qt and Qt Creator are supported. Building against Qt Creator snapshots
-is currently not supported.
-
 [1]: https://help.github.com/en/actions/automating-your-workflow-with-github-actions/about-github-actions
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml
index 8c86a99020d..9cf6aa07826 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml
@@ -5,6 +5,7 @@ on: [push]
 env:
   QT_VERSION: %{JS: Util.qtVersion()}
   QT_CREATOR_VERSION: %{JS: Util.qtCreatorVersion()}
+  QT_CREATOR_SNAPSHOT: NO
   PLUGIN_PRO: %{ProFile}
   PLUGIN_NAME: %{PluginName}
 
@@ -114,7 +115,12 @@ jobs:
       shell: cmake -P {0}
       run: |
         string(REGEX MATCH "([0-9]+.[0-9]+).[0-9]+" outvar "$ENV{QT_CREATOR_VERSION}")
-        set(qtc_base_url "https://download.qt.io/official_releases/qtcreator/${CMAKE_MATCH_1}/$ENV{QT_CREATOR_VERSION}")
+
+        set(qtc_base_url "https://download.qt.io/official_releases/qtcreator/${CMAKE_MATCH_1}/$ENV{QT_CREATOR_VERSION}/installer_source")
+        set(qtc_snapshot "$ENV{QT_CREATOR_SNAPSHOT}")
+        if (qtc_snapshot)
+          set(qtc_base_url "https://download.qt.io/snapshots/qtcreator/${CMAKE_MATCH_1}/$ENV{QT_CREATOR_VERSION}/installer_source/${qtc_snapshot}")
+        endif()
 
         if ("${{ runner.os }}" STREQUAL "Windows")
           set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
@@ -142,7 +148,7 @@ jobs:
 
         foreach(package qtcreator qtcreator_dev)
           file(DOWNLOAD
-            "${qtc_base_url}/installer_source/${qtc_platform}/${package}.7z" ./${package}.7z SHOW_PROGRESS)
+            "${qtc_base_url}/${qtc_platform}/${package}.7z" ./${package}.7z SHOW_PROGRESS)
           execute_process(COMMAND
             ${CMAKE_COMMAND} -E tar xvf ../${package}.7z WORKING_DIRECTORY qtcreator)
         endforeach()

From d06eee52186928dd297d1cb3137c0821e6777d93 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Fri, 14 Feb 2020 16:55:29 +0100
Subject: [PATCH 09/10] Doc: Fix QDoc warnings in Core plugin dialogs classes

- Fix IOptionsPage class docs
- Mark PromptOverwriteDialog and ReadOnlyFilesDialog

Fixes: QTCREATORBUG-23608
Change-Id: I6a646f0bd68230a7c5f80bd748bda20729f23b74
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../images/qtcreator-options-dialog.png       | Bin 0 -> 21703 bytes
 .../coreplugin/dialogs/ioptionspage.cpp       |  71 +++++++++++-------
 .../dialogs/promptoverwritedialog.cpp         |   4 +-
 .../dialogs/readonlyfilesdialog.cpp           |  24 +++++-
 4 files changed, 68 insertions(+), 31 deletions(-)
 create mode 100644 doc/qtcreatordev/images/qtcreator-options-dialog.png

diff --git a/doc/qtcreatordev/images/qtcreator-options-dialog.png b/doc/qtcreatordev/images/qtcreator-options-dialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a446b616dadb81d1ec5670de61c08439441391
GIT binary patch
literal 21703
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

literal 0
HcmV?d00001

diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
index 531466d8ad5..e2d2ea5e9ce 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
@@ -39,12 +39,25 @@
 
 using namespace Utils;
 
+/*!
+    \class Core::IOptionsPageProvider
+    \inmodule QtCreator
+    \internal
+*/
+/*!
+    \class Core::IOptionsPageWidget
+    \inmodule QtCreator
+    \internal
+*/
+
 /*!
     \class Core::IOptionsPage
-    \mainclass
-    \inmodule Qt Creator
+    \ingroup mainclasses
+    \inmodule QtCreator
     \brief The IOptionsPage class is an interface for providing pages for the
-    \gui Options dialog (called \gui Preferences on Mac OS).
+    \uicontrol Options dialog (called \uicontrol Preferences on \macos).
+
+    \image qtcreator-options-dialog.png
 */
 
 /*!
@@ -64,31 +77,28 @@ using namespace Utils;
     \fn Id IOptionsPage::category() const
 
     Returns the unique id for the category that the options page should be displayed in. This id is
-    used for sorting the list on the left side of the \gui Options dialog.
+    used for sorting the list on the left side of the \uicontrol Options dialog.
 */
 
 /*!
     \fn QString IOptionsPage::displayCategory() const
 
     Returns the translated category name of the options page. This name is displayed in the list on
-    the left side of the \gui Options dialog.
+    the left side of the \uicontrol Options dialog.
 */
 
 /*!
-    \fn QIcon IOptionsPage::categoryIcon() const
-
     Returns the category icon of the options page. This icon is displayed in the list on the left
-    side of the \gui Options dialog.
+    side of the \uicontrol Options dialog.
 */
-
 QIcon Core::IOptionsPage::categoryIcon() const
 {
     return m_categoryIcon.icon();
 }
 
 /*!
-    This sets a callback to create page widgets on demand. The widget will
-    be destroyed on \c finish.
+    Sets the \a widgetCreator callback to create page widgets on demand. The
+    widget will be destroyed on finish().
  */
 void Core::IOptionsPage::setWidgetCreator(const WidgetCreator &widgetCreator)
 {
@@ -96,16 +106,14 @@ void Core::IOptionsPage::setWidgetCreator(const WidgetCreator &widgetCreator)
 }
 
 /*!
-    \fn QWidget *IOptionsPage::widget()
-
-    Returns the widget to show in the \gui Options dialog. You should create a widget lazily here,
+    Returns the widget to show in the \uicontrol Options dialog. You should create a widget lazily here,
     and delete it again in the finish() method. This method can be called multiple times, so you
     should only create a new widget if the old one was deleted.
 
-    Alternatively, use \c setWidgetCreator to set a callback function that is used to
+    Alternatively, use setWidgetCreator() to set a callback function that is used to
     lazily create a widget in time.
 
-    Either override this function in a derived class, or set a \c widgetCreator.
+    Either override this function in a derived class, or set a widget creator.
 */
 
 QWidget *Core::IOptionsPage::widget()
@@ -117,10 +125,12 @@ QWidget *Core::IOptionsPage::widget()
 }
 
 /*!
-    This is called when selecting the \gui Apply button on the options page dialog. It should detect
-    whether any changes were made and store those.
+    Called when selecting the \uicontrol Apply button on the options page dialog.
+    Should detect whether any changes were made and store those.
 
-    Either override this function in a derived class, or set a \c widgetCreator.
+    Either override this function in a derived class, or set a widget creator.
+
+    \sa setWidgetCreator()
 */
 
 void Core::IOptionsPage::apply()
@@ -131,10 +141,12 @@ void Core::IOptionsPage::apply()
 }
 
 /*!
-    This is called directly before the \gui Options dialog closes. Here you should delete the widget that
-    was created in widget() to free resources.
+    Called directly before the \uicontrol Options dialog closes. Here you should
+    delete the widget that was created in widget() to free resources.
 
-    Either override this function in a derived class, or set a \c widgetCreator.
+    Either override this function in a derived class, or set a widget creator.
+
+    \sa setWidgetCreator()
 */
 
 void Core::IOptionsPage::finish()
@@ -146,6 +158,10 @@ void Core::IOptionsPage::finish()
     }
 }
 
+/*!
+    Sets \a categoryIconPath as the path to the category icon of the options
+    page.
+*/
 void Core::IOptionsPage::setCategoryIconPath(const QString &categoryIconPath)
 {
     m_categoryIcon = Icon({{categoryIconPath, Theme::PanelTextColorDark}}, Icon::Tint);
@@ -176,7 +192,7 @@ void Core::IOptionsPage::setCategoryIconPath(const QString &categoryIconPath)
 */
 
 /*!
-    \fn void IOptionsPage::setCategoryIcon(const QString &categoryIcon)
+    \fn void IOptionsPage::setCategoryIcon(const Utils::Icon &categoryIcon)
 
     Sets \a categoryIcon as the category icon of the options page.
 */
@@ -185,7 +201,7 @@ static QList<Core::IOptionsPage *> g_optionsPages;
 
 /*!
     Constructs an options page with the given \a parent and registers it
-    at the global options page pool if \a registerGlobally is true.
+    at the global options page pool if \a registerGlobally is \c true.
 */
 Core::IOptionsPage::IOptionsPage(QObject *parent, bool registerGlobally)
     : QObject(parent)
@@ -195,20 +211,23 @@ Core::IOptionsPage::IOptionsPage(QObject *parent, bool registerGlobally)
 }
 
 /*!
-    Destroys the options page.
+    \internal
  */
 Core::IOptionsPage::~IOptionsPage()
 {
     g_optionsPages.removeOne(this);
 }
 
+/*!
+    Returns a list of all options pages.
+ */
 const QList<Core::IOptionsPage *> Core::IOptionsPage::allOptionsPages()
 {
     return g_optionsPages;
 }
 
 /*!
-    Is used by the \gui Options dialog search filter to match \a searchKeyWord to this options
+    Is used by the \uicontrol Options dialog search filter to match \a searchKeyWord to this options
     page. This defaults to take the widget and then looks for all child labels, check boxes, push
     buttons, and group boxes. Should return \c true when a match is found.
 */
diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
index a9434616c90..d29c56aef01 100644
--- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
+++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
@@ -39,7 +39,9 @@
 enum { FileNameRole = Qt::UserRole + 1 };
 
 /*!
-    \class Core::Internal::PromptOverwriteDialog
+    \class Core::PromptOverwriteDialog
+    \inmodule QtCreator
+    \internal
     \brief The PromptOverwriteDialog class implements a dialog that asks
     users whether they want to overwrite files.
 
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
index d9d11277a8f..d41445d8f79 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
@@ -133,16 +133,32 @@ ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate()
 using namespace Internal;
 
 /*!
- * \class ReadOnlyFilesDialog
+ * \class Core::ReadOnlyFilesDialog
+ * \inmodule QtCreator
+ * \internal
  * \brief The ReadOnlyFilesDialog class implements a dialog to show a set of
  * files that are classified as not writable.
  *
  * Automatically checks which operations are allowed to make the file writable. These operations
- * are Make Writable which tries to set the file permissions in the file system,
- * Open With Version Control System if the open operation is allowed by the version control system
- * and Save As which is used to save the changes to a document in another file.
+ * are \c MakeWritable (RO_MakeWritable), which tries to set the file permissions in the file system,
+ * \c OpenWithVCS (RO_OpenVCS) if the open operation is allowed by the version control system,
+ * and \c SaveAs (RO_SaveAs), which is used to save the changes to a document under another file
+ * name.
  */
 
+/*! \enum ReadOnlyFilesDialog::ReadOnlyResult
+    This enum holds the operations that are allowed to make the file writable.
+
+     \value RO_Cancel
+            Cancels the operation.
+     \value RO_OpenVCS
+            Opens the file under control of the version control system.
+     \value RO_MakeWritable
+            Sets the file permissions in the file system.
+     \value RO_SaveAs
+            Saves changes to a document under another file name.
+*/
+
 ReadOnlyFilesDialog::ReadOnlyFilesDialog(const Utils::FilePaths &filePaths, QWidget *parent)
     : QDialog(parent)
     , d(new ReadOnlyFilesDialogPrivate(this))

From 8046e3311f225c1224527157d0a3e27b8e980736 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Thu, 13 Feb 2020 16:14:56 +0100
Subject: [PATCH 10/10] Doc: Fix QDoc warnings in Find classes

- Document BaseTextFind and FindSupport
- Mark undocumented classes and namespaces \internal
- Add and fix docs for IFindFilter, SearchResult, and
  SearchResultWindow

Fixes: QTCREATORBUG-23600
Change-Id: Ic9445f7f15562f114f4cbd9fe16988d7249d48db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../src/common-extension-tasks.qdoc           |   7 +-
 src/plugins/coreplugin/find/basetextfind.cpp  |  83 +++++++-
 src/plugins/coreplugin/find/findplugin.cpp    |   6 +-
 .../find/highlightscrollbarcontroller.cpp     |  12 ++
 src/plugins/coreplugin/find/ifindfilter.cpp   | 120 +++++++----
 src/plugins/coreplugin/find/ifindsupport.cpp  | 113 ++++++++++
 src/plugins/coreplugin/find/itemviewfind.cpp  |   6 +
 src/plugins/coreplugin/find/optionspopup.cpp  |   6 +
 .../coreplugin/find/searchresultwindow.cpp    | 196 ++++++++++++++----
 src/plugins/coreplugin/icore.cpp              |  27 ++-
 10 files changed, 485 insertions(+), 91 deletions(-)

diff --git a/doc/qtcreatordev/src/common-extension-tasks.qdoc b/doc/qtcreatordev/src/common-extension-tasks.qdoc
index 1cf6c90c768..36f88967818 100644
--- a/doc/qtcreatordev/src/common-extension-tasks.qdoc
+++ b/doc/qtcreatordev/src/common-extension-tasks.qdoc
@@ -86,13 +86,13 @@
         \row
             \li Add a find filter to the \uicontrol Find dialog.
             \li Implement any kind of search term based search.
-            \li \l{Find::IFindFilter}, \l{Core::SearchResultWindow}
+            \li \l{Core::IFindFilter}, \l{Core::SearchResultWindow}
 
         \row
             \li Add support for the find tool bar to a widget.
             \li The widget that has focus is asked whether it supports text
                 search. You can add support for widgets under your control.
-            \li \l{Core::IFindSupport}, \l{Find::BaseTextFind}
+            \li \l{Core::IFindSupport}, \l{Core::BaseTextFind}
 
         \omit
         \row
@@ -111,8 +111,7 @@
             \li For a text typed in by the user you provide a list of things to
                 show in the popup. When the user selects an entry you are
                 requested to do whatever you want.
-            \li \l{Core::ILocatorFilter}, \l{Core::LocatorFilterEntry},
-                \l{Locator::BaseFileFilter}
+            \li \l{Core::ILocatorFilter}, \l{Core::BaseFileFilter}
 
         \row
             \li Show a progress indicator for a concurrently running task.
diff --git a/src/plugins/coreplugin/find/basetextfind.cpp b/src/plugins/coreplugin/find/basetextfind.cpp
index ef7042bd5de..2d3cb7de0b5 100644
--- a/src/plugins/coreplugin/find/basetextfind.cpp
+++ b/src/plugins/coreplugin/find/basetextfind.cpp
@@ -81,17 +81,54 @@ BaseTextFindPrivate::BaseTextFindPrivate(QPlainTextEdit *editor)
 {
 }
 
+/*!
+    \class Core::BaseTextFind
+    \inmodule QtCreator
+
+    \brief The BaseTextFind class implements a find filter for QPlainTextEdit
+    and QTextEdit based widgets.
+
+    \sa Core::IFindFilter
+*/
+
+/*!
+    \fn void BaseTextFind::findScopeChanged(const QTextCursor &start,
+                           const QTextCursor &end,
+                           int verticalBlockSelectionFirstColumn,
+                           int verticalBlockSelectionLastColumn)
+
+    This signal is emitted when the search
+    scope changes to \a start, \a end,
+    \a verticalBlockSelectionFirstColumn, and
+    \a verticalBlockSelectionLastColumn.
+*/
+
+/*!
+    \fn void BaseTextFind::highlightAllRequested(const QString &txt, Core::FindFlags findFlags)
+
+    This signal is emitted when the search results for \a txt using the given
+    \a findFlags should be highlighted in the editor widget.
+*/
+
+/*!
+    \internal
+*/
 BaseTextFind::BaseTextFind(QTextEdit *editor)
     : d(new BaseTextFindPrivate(editor))
 {
 }
 
-
+/*!
+    \internal
+*/
 BaseTextFind::BaseTextFind(QPlainTextEdit *editor)
     : d(new BaseTextFindPrivate(editor))
 {
 }
 
+/*!
+    \internal
+*/
 BaseTextFind::~BaseTextFind()
 {
     delete d;
@@ -121,28 +158,43 @@ bool BaseTextFind::isReadOnly() const
     return d->m_editor ? d->m_editor->isReadOnly() : d->m_plaineditor->isReadOnly();
 }
 
+/*!
+    \reimp
+*/
 bool BaseTextFind::supportsReplace() const
 {
     return !isReadOnly();
 }
 
+/*!
+    \reimp
+*/
 FindFlags BaseTextFind::supportedFindFlags() const
 {
     return FindBackward | FindCaseSensitively | FindRegularExpression
             | FindWholeWords | FindPreserveCase;
 }
 
+/*!
+    \reimp
+*/
 void BaseTextFind::resetIncrementalSearch()
 {
     d->m_incrementalStartPos = -1;
     d->m_incrementalWrappedState = false;
 }
 
+/*!
+    \reimp
+*/
 void BaseTextFind::clearHighlights()
 {
     highlightAll(QString(), {});
 }
 
+/*!
+    \reimp
+*/
 QString BaseTextFind::currentFindString() const
 {
     QTextCursor cursor = textCursor();
@@ -168,6 +220,9 @@ QString BaseTextFind::currentFindString() const
     return QString();
 }
 
+/*!
+    \reimp
+*/
 QString BaseTextFind::completedFindString() const
 {
     QTextCursor cursor = textCursor();
@@ -176,6 +231,9 @@ QString BaseTextFind::completedFindString() const
     return cursor.selectedText();
 }
 
+/*!
+    \reimp
+*/
 IFindSupport::Result BaseTextFind::findIncremental(const QString &txt, FindFlags findFlags)
 {
     QTextCursor cursor = textCursor();
@@ -195,6 +253,9 @@ IFindSupport::Result BaseTextFind::findIncremental(const QString &txt, FindFlags
     return found ? Found : NotFound;
 }
 
+/*!
+    \reimp
+*/
 IFindSupport::Result BaseTextFind::findStep(const QString &txt, FindFlags findFlags)
 {
     bool wrapped = false;
@@ -208,6 +269,9 @@ IFindSupport::Result BaseTextFind::findStep(const QString &txt, FindFlags findFl
     return found ? Found : NotFound;
 }
 
+/*!
+    \reimp
+*/
 void BaseTextFind::replace(const QString &before, const QString &after, FindFlags findFlags)
 {
     QTextCursor cursor = replaceInternal(before, after, findFlags);
@@ -259,6 +323,9 @@ QTextCursor BaseTextFind::replaceInternal(const QString &before, const QString &
     return cursor;
 }
 
+/*!
+    \reimp
+*/
 bool BaseTextFind::replaceStep(const QString &before, const QString &after, FindFlags findFlags)
 {
     QTextCursor cursor = replaceInternal(before, after, findFlags);
@@ -269,6 +336,10 @@ bool BaseTextFind::replaceStep(const QString &before, const QString &after, Find
     return found;
 }
 
+/*!
+    \reimp
+    Returns the number of search hits replaced.
+*/
 int BaseTextFind::replaceAll(const QString &before, const QString &after, FindFlags findFlags)
 {
     QTextCursor editCursor = textCursor();
@@ -408,6 +479,9 @@ bool BaseTextFind::inScope(int startPosition, int endPosition) const
             && d->m_findScopeEnd.position() >= endPosition);
 }
 
+/*!
+    \reimp
+*/
 void BaseTextFind::defineFindScope()
 {
     QTextCursor cursor = textCursor();
@@ -436,6 +510,9 @@ void BaseTextFind::defineFindScope()
     }
 }
 
+/*!
+    \reimp
+*/
 void BaseTextFind::clearFindScope()
 {
     d->m_findScopeStart = QTextCursor();
@@ -447,6 +524,10 @@ void BaseTextFind::clearFindScope()
                           d->m_findScopeVerticalBlockSelectionLastColumn);
 }
 
+/*!
+    \reimp
+    Emits highlightAllRequested().
+*/
 void BaseTextFind::highlightAll(const QString &txt, FindFlags findFlags)
 {
     emit highlightAllRequested(txt, findFlags);
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index 04236779184..aa3165547c8 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -53,11 +53,13 @@
 #include <QSettings>
 
 /*!
-    \namespace Core::Internal
+    \namespace Core::Internal::ItemDataRoles
     \internal
 */
+
 /*!
-    \namespace Core::Internal::ItemDataRoles
+    \class Core::Find
+    \inmodule QtCreator
     \internal
 */
 
diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
index b9d07b70da4..f68739f1e22 100644
--- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
+++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
@@ -36,6 +36,18 @@
 using namespace Utils;
 namespace Core {
 
+/*!
+    \class Core::Highlight
+    \inmodule QtCreator
+    \internal
+*/
+
+/*!
+    \class Core::HighlightScrollBarController
+    \inmodule QtCreator
+    \internal
+*/
+
 class HighlightScrollBarOverlay : public QWidget
 {
 public:
diff --git a/src/plugins/coreplugin/find/ifindfilter.cpp b/src/plugins/coreplugin/find/ifindfilter.cpp
index c861d1e0df9..fef203a1f8c 100644
--- a/src/plugins/coreplugin/find/ifindfilter.cpp
+++ b/src/plugins/coreplugin/find/ifindfilter.cpp
@@ -33,27 +33,32 @@
 #include <QPixmap>
 
 /*!
-    \class Find::IFindFilter
+    \class Core::IFindFilter
+    \inmodule QtCreator
     \brief The IFindFilter class is the base class for find implementations
-    that are invoked by selecting \gui Edit > \gui {Find/Replace} >
-    \gui {Advanced Find}.
+    that are invoked by selecting \uicontrol Edit > \uicontrol {Find/Replace} >
+    \uicontrol {Advanced Find}.
 
-    Implementations of this class add an additional \gui Scope to the \gui {Advanced
+    Implementations of this class add an additional \uicontrol Scope to the \uicontrol {Advanced
     Find} dialog. That can be any search that requires the user to provide
     a text based search term (potentially with find flags like
     searching case sensitively or using regular expressions). Existing
-    scopes are \gui {All Projects} that searches from all files in all projects
-    and \gui {Files in File System} where the user provides a directory and file
+    scopes are \uicontrol {All Projects} that searches from all files in all projects
+    and \uicontrol {Files in File System} where the user provides a directory and file
     patterns to search.
 
+    \image qtcreator-search-filesystem.png
+
     To make your find scope available to the user, you need to implement this
     class, and register an instance of your subclass in the plugin manager.
 
     A common way to present the search results to the user, is to use the
-    shared \gui{Search Results} panel.
+    shared \uicontrol{Search Results} pane.
+
+    \image qtcreator-searchresults.png
 
     If you want to implement a find filter that is doing a file based text
-    search, you should use Find::BaseFileFind, which already implements all
+    search, you should use \l Core::BaseTextFind, which already implements all
     the details for this kind of search, only requiring you to provide an
     iterator over the file names of the files that should be searched.
 
@@ -62,19 +67,18 @@
         \li Start your search in a separate thread
         \li Make this known to the Core::ProgressManager, for a progress bar
            and the ability to cancel the search
-        \li Interface with the shared \gui{Search Results} panel, to show
+        \li Interface with the shared \uicontrol{Search Results} pane, to show
            the search results, handle the event that the user click on one
            of the search result items, and possible handle a global replace
            of all or some of the search result items.
     \endlist
 
-    Luckily QtConcurrent and the search result panel provide the frameworks
+    Luckily QtConcurrent and the search results pane provide the frameworks
     that make it relatively easy to implement,
     while ensuring a common way for the user.
 
-    The common pattern is roughly this:
-
-    Implement the actual search within a QtConcurrent based function, that is
+    The common pattern is roughly to first implement the actual search
+    within a QtConcurrent based function. That is
     a function that takes a \c{QFutureInterface<MySearchResult> &future}
     as the first parameter and the other information needed for the search
     as additional parameters. It should set useful progress information
@@ -82,21 +86,17 @@
     and \c{future.isCanceled()}, and report the search results
     (possibly in chunks) via \c{future.reportResult}.
 
-    In the find filter's find/replaceAll function, get the shared
-    \gui{Search Results} window, initiate a new search and connect the
+    In the find filter's \c find() or \c replaceAll() function, get the shared
+    \uicontrol{Search Results} window, initiate a new search and connect the
     signals for handling selection of results and the replace action
     (see the Core::SearchResultWindow class for details).
     Start your search implementation via the corresponding QtConcurrent
     functions. Add the returned QFuture object to the Core::ProgressManager.
     Use a QFutureWatcher on the returned QFuture object to receive a signal
     when your search implementation reports search results, and add these
-    to the shared \gui{Search Results} window.
+    to the shared \uicontrol{Search Results} window.
 */
 
-/*!
-    \fn IFindFilter::~IFindFilter()
-    \internal
-*/
 
 /*!
     \fn QString IFindFilter::id() const
@@ -110,7 +110,8 @@
     Returns the name of the find filter or scope as presented to the user.
 
     This is the name that appears in the scope selection combo box, for example.
-    Always return a translatable string (that is, use tr() for the return value).
+    Always return a translatable string. That is, use \c tr() for the return
+    value.
 */
 
 /*!
@@ -118,20 +119,18 @@
     Returns whether the user should be able to select this find filter
     at the moment.
 
-    This is used for the \gui {Current Projects} scope, for example. If the user
+    This is used for the \uicontrol {Current Projects} scope, for example. If the user
     has not
     opened a project, the scope is disabled.
 
-    \sa changed()
+    \sa enabledChanged()
 */
 
 /*!
-    \fn QKeySequence IFindFilter::defaultShortcut() const
-    Returns the shortcut that can be used to open the advanced find
-    dialog with this filter or scope preselected.
+    \fn bool IFindFilter::isValid() const
+    Returns whether the find filter is valid.
 
-    Usually return an empty shortcut here, the user can still choose and
-    assign a specific shortcut to this find scope via the preferences.
+    \sa validChanged()
 */
 
 /*!
@@ -143,7 +142,7 @@
 */
 
 /*!
-    \fn bool showSearchTermInput() const
+    \fn bool IFindFilter::showSearchTermInput() const
     Returns whether the find filter wants to show the search term line edit.
 
     The default value is \c true, override this function to return \c false, if
@@ -151,14 +150,14 @@
 */
 
 /*!
-    \fn void IFindFilter::findAll(const QString &txt, Core::FindFlags findFlags)
+    \fn void IFindFilter::findAll(const QString &txt, FindFlags findFlags)
     This function is called when the user selected this find scope and
     initiated a search.
 
     You should start a thread which actually performs the search for \a txt
     using the given \a findFlags
-    (add it to Core::ProgressManager for a progress bar!) and presents the
-    search results to the user (using the \gui{Search Results} output pane).
+    (add it to Core::ProgressManager for a progress bar) and presents the
+    search results to the user (using the \uicontrol{Search Results} output pane).
     For more information, see the descriptions of this class,
     Core::ProgressManager, and Core::SearchResultWindow.
 
@@ -168,7 +167,7 @@
 */
 
 /*!
-    \fn void IFindFilter::replaceAll(const QString &txt, Core::FindFlags findFlags)
+    \fn void IFindFilter::replaceAll(const QString &txt, FindFlags findFlags)
     Override this function if you want to support search and replace.
 
     This function is called when the user selected this find scope and
@@ -177,8 +176,8 @@
 
     You should start a thread which actually performs the search for \a txt
     using the given \a findFlags
-    (add it to Core::ProgressManager for a progress bar!) and presents the
-    search results to the user (using the \gui{Search Results} output pane).
+    (add it to Core::ProgressManager for a progress bar) and presents the
+    search results to the user (using the \uicontrol{Search Results} output pane).
     For more information see the descriptions of this class,
     Core::ProgressManager, and Core::SearchResultWindow.
 
@@ -192,7 +191,7 @@
     Returns a widget that contains additional controls for options
     for this find filter.
 
-    The widget will be shown below the common options in the \gui {Advanced Find}
+    The widget will be shown below the common options in the \uicontrol {Advanced Find}
     dialog. It will be reparented and deleted by the find plugin.
 */
 
@@ -211,44 +210,71 @@
 /*!
     \fn void IFindFilter::enabledChanged(bool enabled)
 
-    Signals that the enabled state of this find filter has changed.
+    This signal is emitted when the \a enabled state of this find filter
+    changes.
 */
 
 /*!
-    \fn Core::FindFlags BaseTextFind::supportedFindFlags() const
-    Returns the find flags, like whole words or regular expressions,
-    that this find filter supports.
+    \fn void IFindFilter::validChanged(bool valid)
 
-    Depending on the returned value, the default find option widgets are
-    enabled or disabled.
-    The default is Find::FindCaseSensitively, Find::FindRegularExpression
-    and Find::FindWholeWords
+    This signal is emitted when the \a valid state of this find filter changes.
+*/
+
+/*!
+    \fn void IFindFilter::displayNameChanged()
+
+    This signal is emitted when the display name of this find filter changes.
 */
 
 namespace Core {
 
 static QList<IFindFilter *> g_findFilters;
 
+/*!
+    \internal
+*/
 IFindFilter::IFindFilter()
 {
     g_findFilters.append(this);
 }
 
+/*!
+    \internal
+*/
 IFindFilter::~IFindFilter()
 {
     g_findFilters.removeOne(this);
 }
 
+/*!
+    Returns a list of find filters.
+*/
 const QList<IFindFilter *> IFindFilter::allFindFilters()
 {
     return g_findFilters;
 }
 
+/*!
+    Returns the shortcut that can be used to open the advanced find
+    dialog with this filter or scope preselected.
+
+    Usually return an empty shortcut here, the user can still choose and
+    assign a specific shortcut to this find scope via the preferences.
+*/
 QKeySequence IFindFilter::defaultShortcut() const
 {
     return QKeySequence();
 }
 
+/*!
+    Returns the find flags, like whole words or regular expressions,
+    that this find filter supports.
+
+    Depending on the returned value, the default find option widgets are
+    enabled or disabled.
+    The default is Core::FindCaseSensitively, Core::FindRegularExpression
+    and Core::FindWholeWords.
+*/
 FindFlags IFindFilter::supportedFindFlags() const
 {
     return FindCaseSensitively
@@ -256,6 +282,9 @@ FindFlags IFindFilter::supportedFindFlags() const
          | FindWholeWords;
 }
 
+/*!
+    Returns icons for the find flags \a flags.
+*/
 QPixmap IFindFilter::pixmapForFindFlags(FindFlags flags)
 {
     static const QPixmap casesensitiveIcon = Icons::FIND_CASE_INSENSITIVELY.pixmap();
@@ -300,6 +329,9 @@ QPixmap IFindFilter::pixmapForFindFlags(FindFlags flags)
     return pixmap;
 }
 
+/*!
+    Returns descriptive text labels for the find flags \a flags.
+*/
 QString IFindFilter::descriptionForFindFlags(FindFlags flags)
 {
     QStringList flagStrings;
diff --git a/src/plugins/coreplugin/find/ifindsupport.cpp b/src/plugins/coreplugin/find/ifindsupport.cpp
index da54c5b41ea..f36bea2146d 100644
--- a/src/plugins/coreplugin/find/ifindsupport.cpp
+++ b/src/plugins/coreplugin/find/ifindsupport.cpp
@@ -30,6 +30,106 @@
 
 using namespace Core;
 
+/*!
+    \class Core::IFindSupport
+    \inmodule QtCreator
+    \brief The IFindSupport class provides functions for searching in a document
+     or widget.
+
+    \sa Core::BaseTextFind
+*/
+
+/*!
+    \enum IFindSupport::Result
+    This enum holds whether the search term was found within the search scope
+    using the find flags.
+
+    \value Found        The search term was found.
+    \value NotFound     The search term was not found.
+    \value NotYetFound  The search term has not been found yet.
+*/
+
+/*!
+    \fn IFindSupport::IFindSupport()
+    \internal
+*/
+
+/*!
+    \fn IFindSupport::~IFindSupport()
+    \internal
+*/
+
+/*!
+    \fn bool IFindSupport::supportsReplace() const
+    Returns whether the find filter supports search and replace.
+*/
+
+/*!
+    \fn FindFlags IFindSupport::supportedFindFlags() const
+    Returns the find flags, such as whole words or regular expressions,
+    that this find filter supports.
+
+    Depending on the returned value, the default find option widgets are
+    enabled or disabled.
+
+    The default is Core::FindBackward, Core::FindCaseSensitively,
+    Core::FindRegularExpression, Core::FindWholeWords, and
+    Core::FindPreserveCase.
+*/
+
+/*!
+    \fn void IFindSupport::resetIncrementalSearch()
+    Resets incremental search to start position.
+*/
+
+/*!
+    \fn void IFindSupport::clearHighlights()
+    Clears highlighting of search results in the searched widget.
+*/
+
+/*!
+    \fn QString IFindSupport::currentFindString() const
+    Returns the current search string.
+*/
+
+/*!
+    \fn QString IFindSupport::completedFindString() const
+    Returns the complete search string.
+*/
+
+/*!
+    \fn void IFindSupport::highlightAll(const QString &txt, FindFlags findFlags)
+    Highlights all search hits for \a txt when using \a findFlags.
+*/
+
+/*!
+    \fn Result IFindSupport::findIncremental(const QString &txt, FindFlags findFlags)
+    Performs an incremental search of the search term \a txt using \a findFlags.
+*/
+
+/*!
+    \fn Result IFindSupport::findStep(const QString &txt, FindFlags findFlags)
+    Searches for \a txt using \a findFlags.
+*/
+
+/*!
+    \fn void IFindSupport::defineFindScope()
+    Defines the find scope.
+*/
+
+/*!
+    \fn void IFindSupport::clearFindScope()
+    Clears the find scope.
+*/
+
+/*!
+    \fn void IFindSupport::changed()
+    This signal is emitted when the search changes.
+*/
+
+/*!
+    Replaces \a before with \a after as specified by \a findFlags.
+*/
 void IFindSupport::replace(const QString &before, const QString &after, FindFlags findFlags)
 {
     Q_UNUSED(before)
@@ -37,6 +137,12 @@ void IFindSupport::replace(const QString &before, const QString &after, FindFlag
     Q_UNUSED(findFlags)
 }
 
+/*!
+    Replaces \a before with \a after as specified by \a findFlags, and then
+    performs findStep().
+
+    Returns whether the find step found another match.
+*/
 bool IFindSupport::replaceStep(const QString &before, const QString &after, FindFlags findFlags)
 {
     Q_UNUSED(before)
@@ -45,6 +151,10 @@ bool IFindSupport::replaceStep(const QString &before, const QString &after, Find
     return false;
 }
 
+/*!
+    Finds and replaces all instances of \a before with \a after as specified by
+    \a findFlags.
+*/
 int IFindSupport::replaceAll(const QString &before, const QString &after, FindFlags findFlags)
 {
     Q_UNUSED(before)
@@ -53,6 +163,9 @@ int IFindSupport::replaceAll(const QString &before, const QString &after, FindFl
     return 0;
 }
 
+/*!
+    Shows \a parent overlayed with the wrap indicator.
+*/
 void IFindSupport::showWrapIndicator(QWidget *parent)
 {
     Utils::FadingIndicator::showPixmap(parent, Utils::StyleHelper::dpiSpecificImageFile(
diff --git a/src/plugins/coreplugin/find/itemviewfind.cpp b/src/plugins/coreplugin/find/itemviewfind.cpp
index 3f07dff596c..ae1103a165f 100644
--- a/src/plugins/coreplugin/find/itemviewfind.cpp
+++ b/src/plugins/coreplugin/find/itemviewfind.cpp
@@ -35,6 +35,12 @@
 
 namespace Core {
 
+/*!
+    \class Core::ItemViewFind
+    \inmodule QtCreator
+    \internal
+*/
+
 class ItemModelFindPrivate
 {
 public:
diff --git a/src/plugins/coreplugin/find/optionspopup.cpp b/src/plugins/coreplugin/find/optionspopup.cpp
index d7274f87e0c..b766cee1624 100644
--- a/src/plugins/coreplugin/find/optionspopup.cpp
+++ b/src/plugins/coreplugin/find/optionspopup.cpp
@@ -37,6 +37,12 @@
 
 namespace Core {
 
+/*!
+    \class Core::OptionsPopup
+    \inmodule QtCreator
+    \internal
+*/
+
 OptionsPopup::OptionsPopup(QWidget *parent, const QVector<Id> &commands)
     : QWidget(parent, Qt::Popup)
 {
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index ec723c89285..a9895f720c8 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -53,6 +53,30 @@ static const int MAX_SEARCH_HISTORY = 12;
 
 namespace Core {
 
+/*!
+    \namespace Core::Search
+    \inmodule QtCreator
+    \internal
+*/
+
+/*!
+    \class Core::Search::TextPosition
+    \inmodule QtCreator
+    \internal
+*/
+
+/*!
+    \class Core::Search::TextRange
+    \inmodule QtCreator
+    \internal
+*/
+
+/*!
+    \class Core::SearchResultItem
+    \inmodule QtCreator
+    \internal
+*/
+
 namespace Internal {
 
     class InternalScrollArea : public QScrollArea
@@ -236,6 +260,7 @@ using namespace Core::Internal;
 
 /*!
     \class Core::SearchResult
+    \inmodule QtCreator
     \brief The SearchResult class reports user interaction, such as the
     activation of a search result item.
 
@@ -251,46 +276,99 @@ using namespace Core::Internal;
 */
 
 /*!
-    \fn void SearchResult::replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase)
+    \fn void SearchResult::replaceButtonClicked(const QString &replaceText,
+                           const QList<Core::SearchResultItem> &checkedItems,
+                           bool preserveCase)
+
     Indicates that the user initiated a text replace by selecting
-    \gui {Replace All}, for example.
+    \uicontrol {Replace All}, for example.
 
     The signal reports the text to use for replacement in \a replaceText,
-    and the list of search result items that were selected by the user
-    in \a checkedItems.
+    the list of search result items that were selected by the user
+    in \a checkedItems, and whether a search and replace should preserve the
+    case of the replaced strings in \a preserveCase.
     The handler of this signal should apply the replace only on the selected
     items.
 */
 
+/*!
+    \enum Core::SearchResult::AddMode
+    This enum type specifies whether the search results should be sorted or
+    ordered:
+
+    \value AddSorted
+           The search results are sorted.
+    \value AddOrdered
+           The search results are ordered.
+*/
+
+/*!
+    \fn void SearchResult::cancelled()
+    This signal is emitted if the user cancels the search.
+*/
+
+/*!
+    \fn void SearchResult::countChanged(int count)
+    This signal is emitted when the number of search hits changes to \a count.
+*/
+
+/*!
+    \fn void SearchResult::paused(bool paused)
+    This signal is emitted when the search status is set to \a paused.
+*/
+
+/*!
+    \fn void SearchResult::requestEnabledCheck()
+
+    This signal is emitted when the enabled status of search results is
+    requested.
+*/
+
+/*!
+    \fn void SearchResult::searchAgainRequested()
+
+    This signal is emitted when the \uicontrol {Search Again} button is
+    selected.
+*/
+
+/*!
+    \fn void SearchResult::visibilityChanged(bool visible)
+
+    This signal is emitted when the visibility of the search results changes
+    to \a visible.
+*/
+
 /*!
     \class Core::SearchResultWindow
+    \inmodule QtCreator
     \brief The SearchResultWindow class is the implementation of a commonly
-    shared \gui{Search Results} output pane. Use it to show search results
-    to a user.
+    shared \uicontrol{Search Results} output pane.
+
+    \image qtcreator-searchresults.png
 
     Whenever you want to show the user a list of search results, or want
     to present UI for a global search and replace, use the single instance
     of this class.
 
-    Except for being an implementation of a output pane, the
-    SearchResultWindow has a few functions and one enum that allows other
+    In addition to being an implementation of an output pane, the
+    SearchResultWindow has functions and enums that enable other
     plugins to show their search results and hook into the user actions for
     selecting an entry and performing a global replace.
 
     Whenever you start a search, call startNewSearch(SearchMode) to initialize
-    the \gui {Search Results} output pane. The parameter determines if the GUI for
+    the \uicontrol {Search Results} output pane. The parameter determines if the GUI for
     replacing should be shown.
     The function returns a SearchResult object that is your
     hook into the signals from user interaction for this search.
-    When you produce search results, call addResults or addResult to add them
-    to the \gui {Search Results} output pane.
-    After the search has finished call finishSearch to inform the
-    \gui {Search Results} output pane about it.
+    When you produce search results, call addResults() or addResult() to add them
+    to the \uicontrol {Search Results} output pane.
+    After the search has finished call finishSearch() to inform the
+    \uicontrol {Search Results} output pane about it.
 
-    You will get activated signals via your SearchResult instance when
-    the user selects a search result item, and, if you started the search
-    with the SearchAndReplace option, the replaceButtonClicked signal
-    when the user requests a replace.
+    You will get activated() signals via your SearchResult instance when
+    the user selects a search result item. If you started the search
+    with the SearchAndReplace option, the replaceButtonClicked() signal
+    is emitted when the user requests a replace.
 */
 
 /*!
@@ -298,6 +376,17 @@ using namespace Core::Internal;
     \internal
 */
 
+/*!
+    \enum SearchResultWindow::PreserveCaseMode
+    This enum type specifies whether a search and replace should preserve the
+    case of the replaced strings:
+
+    \value PreserveCaseEnabled
+           The case is preserved when replacings strings.
+    \value PreserveCaseDisabled
+           The given case is used when replacing strings.
+*/
+
 SearchResultWindow *SearchResultWindow::m_instance = nullptr;
 
 /*!
@@ -322,7 +411,7 @@ SearchResultWindow::~SearchResultWindow()
 }
 
 /*!
-    Returns the single shared instance of the \gui {Search Results} output pane.
+    Returns the single shared instance of the \uicontrol {Search Results} output pane.
 */
 SearchResultWindow *SearchResultWindow::instance()
 {
@@ -356,24 +445,31 @@ QList<QWidget*> SearchResultWindow::toolBarWidgets() const
 }
 
 /*!
-    Tells the \gui {Search Results} output pane to start a new search.
+    Tells the \uicontrol {Search Results} output pane to start a new search.
 
     The \a label should be a string that shortly describes the type of the
     search, that is, the search filter and possibly the most relevant search
-     option, followed by a colon ':'. For example: \c {Project 'myproject':}
+    option, followed by a colon (:). For example: \c {Project 'myproject':}
     The \a searchTerm is shown after the colon.
-    The \a toolTip should elaborate on the search parameters, like file patterns that are searched and
-    find flags.
-    If \a cfgGroup is not empty, it will be used for storing the "do not ask again"
-    setting of a "this change cannot be undone" warning (which is implicitly requested
+
+    The \a toolTip should elaborate on the search parameters, like file patterns
+    that are searched and find flags.
+
+    If \a cfgGroup is not empty, it will be used for storing the \e {do not ask again}
+    setting of a \e {this change cannot be undone} warning (which is implicitly requested
     by passing a non-empty group).
+
+    The \a searchOrSearchAndReplace parameter holds whether the search
+    results pane should show a UI for a global search and replace action.
+    The \a preserveCaseMode parameter holds whether the case of the search
+    string should be preserved when replacing strings.
+
     Returns a SearchResult object that is used for signaling user interaction
     with the results of this search.
     The search result window owns the returned SearchResult
-    and might delete it any time, even while the search is running
-    (for example, when the user clears the \gui {Search Results} pane, or when
-    the user opens so many other searches
-    that this search falls out of the history).
+    and might delete it any time, even while the search is running.
+    For example, when the user clears the \uicontrol {Search Results} pane, or when
+    the user opens so many other searches that this search falls out of the history.
 
 */
 SearchResult *SearchResultWindow::startNewSearch(const QString &label,
@@ -420,7 +516,7 @@ SearchResult *SearchResultWindow::startNewSearch(const QString &label,
 }
 
 /*!
-    Clears the current contents of the \gui {Search Results} output pane.
+    Clears the current contents of the \uicontrol {Search Results} output pane.
 */
 void SearchResultWindow::clearContents()
 {
@@ -495,13 +591,18 @@ void SearchResultWindow::setTextEditorFont(const QFont &font,
         widget->setTextEditorFont(font, color);
 }
 
+/*!
+    Sets the \uicontrol {Search Results} tab width to \a tabWidth.
+*/
 void SearchResultWindow::setTabWidth(int tabWidth)
 {
     d->m_tabWidth = tabWidth;
     foreach (Internal::SearchResultWidget *widget, d->m_searchResultWidgets)
         widget->setTabWidth(tabWidth);
 }
-
+/*!
+    Opens a new search panel.
+*/
 void SearchResultWindow::openNewSearchPanel()
 {
     d->setCurrentIndexWithFocus(0);
@@ -644,23 +745,32 @@ QString SearchResult::textToReplace() const
     return m_widget->textToReplace();
 }
 
+/*!
+    Returns the number of search hits.
+*/
 int SearchResult::count() const
 {
     return m_widget->count();
 }
 
+/*!
+    Sets whether the \uicontrol {Seach Again} button is enabled to \a supported.
+*/
 void SearchResult::setSearchAgainSupported(bool supported)
 {
     m_widget->setSearchAgainSupported(supported);
 }
 
+/*!
+    Returns a UI for a global search and replace action.
+*/
 QWidget *SearchResult::additionalReplaceWidget() const
 {
     return m_widget->additionalReplaceWidget();
 }
 
 /*!
-    Adds a single result line to the \gui {Search Results} output pane.
+    Adds a single result line to the \uicontrol {Search Results} output pane.
 
     \a fileName, \a lineNumber, and \a lineText are shown on the result line.
     \a searchTermStart and \a searchTermLength specify the region that
@@ -683,6 +793,18 @@ void SearchResult::addResult(const QString &fileName, int lineNumber, const QStr
     m_widget->addResult(fileName, lineText, mainRange, userData);
 }
 
+/*!
+    Adds a single result line to the \uicontrol {Search Results} output pane.
+
+    \a mainRange specifies the region from the beginning of the search term
+    through its length that should be visually marked.
+    \a fileName and \a lineText are shown on the result line.
+    You can attach arbitrary \a userData to the search result, which can
+    be used, for example, when reacting to the signals of the search results
+    for your search.
+
+    \sa addResults()
+*/
 void SearchResult::addResult(const QString &fileName,
                              const QString &lineText,
                              Search::TextRange mainRange,
@@ -693,7 +815,8 @@ void SearchResult::addResult(const QString &fileName,
 }
 
 /*!
-    Adds the search result \a items to the \gui {Search Results} output pane.
+    Adds the search result \a items to the \uicontrol {Search Results} output
+    pane using \a mode.
 
     \sa addResult()
 */
@@ -704,8 +827,8 @@ void SearchResult::addResults(const QList<SearchResultItem> &items, AddMode mode
 }
 
 /*!
-    Notifies the \gui {Search Results} output pane that the current search
-    has finished, and the UI should reflect that.
+    Notifies the \uicontrol {Search Results} output pane that the current search
+    has been \a canceled, and the UI should reflect that.
 */
 void SearchResult::finishSearch(bool canceled)
 {
@@ -729,13 +852,16 @@ void SearchResult::restart()
     m_widget->restart();
 }
 
+/*!
+    Sets whether the \uicontrol {Seach Again} button is enabled to \a enabled.
+*/
 void SearchResult::setSearchAgainEnabled(bool enabled)
 {
     m_widget->setSearchAgainEnabled(enabled);
 }
 
 /*!
- * Opens the \gui {Search Results} output pane with this search.
+ * Opens the \uicontrol {Search Results} output pane with this search.
  */
 void SearchResult::popup()
 {
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 83b3f2e2e08..ead03010eb5 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -44,6 +44,22 @@
     which constitute the basic functionality of \QC.
 */
 
+/*!
+    \enum Core::FindFlag
+    This enum holds the find flags.
+
+    \value FindBackward
+           Searches backwards.
+    \value FindCaseSensitively
+           Considers case when searching.
+    \value FindWholeWords
+           Finds only whole words.
+    \value FindRegularExpression
+           Uses a regular epression as a search term.
+    \value FindPreserveCase
+           Preserves the case when replacing search terms.
+*/
+
 /*!
     \namespace Core::Internal
     \internal
@@ -51,6 +67,7 @@
 
 /*!
     \class Core::ICore
+    \inmodule QtCreator
     \brief The ICore class allows access to the different parts that make up
     the basic functionality of \QC.
 
@@ -58,7 +75,7 @@
     instance is created by the Core plugin. You can access this instance
     from your plugin through \c{Core::instance()}.
 
-    \mainclass
+    \ingroup mainclasses
 */
 
 /*!
@@ -81,7 +98,7 @@
 /*!
     \fn bool ICore::showOptionsDialog(Id group, Id page, QWidget *parent = 0);
 
-    Opens the application \gui Options (or \gui Preferences) dialog with preselected
+    Opens the application \uicontrol Options (or \uicontrol Preferences) dialog with preselected
     \a page in the specified \a group.
 
     The arguments refer to the string IDs of the corresponding IOptionsPage.
@@ -230,7 +247,7 @@
     \fn void ICore::openFiles(const QStringList &fileNames, OpenFilesFlags flags = None)
     Opens all files from a list of \a fileNames like it would be
     done if they were given to \QC on the command line, or
-    they were opened via \gui File > \gui Open.
+    they were opened via \uicontrol File > \uicontrol Open.
 */
 
 /*!
@@ -253,12 +270,12 @@
     Signals that the user has requested that the global settings
     should be saved to disk.
 
-    At the moment that happens when the application is closed, and on \gui{Save All}.
+    At the moment that happens when the application is closed, and on \uicontrol{Save All}.
 */
 
 /*!
     \fn void ICore::optionsDialogRequested()
-    Enables plugins to perform actions just before the \gui Tools > \gui Options
+    Enables plugins to perform actions just before the \uicontrol Tools > \uicontrol Options
     dialog is shown.
 */