Merge remote-tracking branch 'origin/9.0'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/texteditor/texteditor.cpp

Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1

1 files changed, 15 insertions, 9 deletions

diff --git a/README.md b/README.md
index 5666df9cb6..14493d1afd 100644
--- a/README.md
+++ b/README.md
@@ -157,15 +157,21 @@ like Qt and LLVM, additionally run
 
     cmake --install . --prefix /path/to/qtcreator_install --component Dependencies
 
-### Performance Analyzer
-
-If you have not installed Qt with the Maintenance Tool, you must
-either set the path to the `perfparser` executable as a value of
-the `PERFPROFILER_PARSER_FILEPATH` environment variable or copy
-the executable to from the Qt Creator installation directory to
-the build directory. That is, copy it from
-`/path/to/qtcreator_install/Tools/QtCreator/libexec/qtcreator/` to
-/path/to/qtcreator_buid/libexec/qtcreator/`.
+### Perf Profiler Support
+
+Support for the [perf](https://perf.wiki.kernel.org/index.php/Main_Page) profiler
+requires the `perfparser` tool that is part of the Qt Creator source package, and also
+part of the Qt Creator Git repository in form of a submodule in `src/tools/perfparser`.
+
+Compilation of `perfparser` requires ELF and DWARF development packages.
+You can either download and extract a prebuilt package from
+https://download.qt.io/development_releases/prebuilt/elfutils/ and add the
+directory to the `CMAKE_PREFIX_PATH` when configuring Qt Creator,
+or install the `libdw-dev` package on Debian-style Linux systems.
+
+You can also point Qt Creator to a separate installation of `perfparser` by
+setting the `PERFPROFILER_PARSER_FILEPATH` environment variable to the full
+path to the executable.
 
 ## Getting LLVM/Clang for the Clang Code Model