Merge remote-tracking branch 'origin/4.9'

Change-Id: I57c5c1ce5c4a86815a84b95ddc826a981afdb673

doc/src/analyze/creator-clang-static-analyzer.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -70,7 +70,17 @@
 
             \image qtcreator-files-to-analyze.png "Analyzer Configuration dialog"
 
-        \li In the \uicontrol {Diagnostic Configuration} group, select a Clang
+        \li In the \uicontrol General group, select \uicontrol {Custom Settings}
+            to modify the analyzer configuration.
+
+        \li To build the project before running the Clang tools, select the
+            \uicontrol {Build the project before analysis} check box. The Clang
+            tools do not require the project to be built before analysis, but
+            they might display misleading warnings about files missing that are
+            generated during the build. For big projects, not building the
+            project might save some time.
+
+        \li In the \uicontrol {Diagnostic configuration} field, select a Clang
             configuration in the list of pre-defined configurations (1). For
             more information about creating a custom configuration, see
             \l {Configuring Clang Tools}.
@@ -104,7 +114,7 @@
 
     To configure Clang diagnostics globally for Clang tools:
 
-    \list
+    \list 1
 
         \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Analyzer >
             \uicontrol {Clang Tools}.
@@ -132,11 +142,25 @@
         \li In the \uicontrol {Diagnostic configuration name} field, give the
             configuration a name, and then select \uicontrol OK.
 
-        \li In the \uicontrol {Clang-Tidy} tab, select the checks to
+        \li In the \uicontrol Clang tab, select the
-            perform.
+            \uicontrol {Use diagnostic flags from the build system} check box
+            to forward diagnostic flags, such as warning flags, from the build
+            system to the Clang code model for displaying annotations in the
+            code editor.
+
+        \li In the \uicontrol {Clang-Tidy} tab, select
+            \uicontrol {Select Checks} to select the checks to perform,
+            \uicontrol {Use .clang-tidy Config File} to read them from a
+            Clang-Tidy configuration file, or \uicontrol Disable to disable
+            them.
 
             \image qtcreator-clang-tidy.png "Clang-Tidy tab"
 
+        \li Select the \uicontrol {Web Page} link to view more
+            information about the available checkers in the
+            \l{https://clang-analyzer.llvm.org/available_checks.html}
+            {Clang Static Analyzer documentation}.
+
         \li To edit the selected check as plain text, select
             \uicontrol {Edit Checks as String}.
 
@@ -145,6 +169,14 @@
 
             \image qtcreator-clazy.png "Clazy tab"
 
+        \li In the \uicontrol {Topic Filter} field, select a topic to view
+            only checks related to that area in the \uicontrol Checks field.
+
+        \li To view all checks again, select \uicontrol {Reset to All}.
+
+        \li To view more information about the checks online, select the
+            \uicontrol {Web Page} links next to them.
+
     \endlist
 
     To suppress diagnostics, select \uicontrol {Suppress This Diagnostic} in the
@@ -154,13 +186,10 @@
 
     \section2 Selecting Clazy Check Levels
 
-    The Clazy checks are divided into levels from 0 to 3. Each level adds checks
+    The Clazy checks are divided into levels from 0 to 3. The checks at level 0
-    to the previous level. The checks at level 0 are very stable and provide
+    are very stable and provide hardly any false positives, while the checks at
-    hardly any false positives, while the checks at level 3 can be considered
+    level 3 can be considered experimental. You can select the checks to perform
-    experimental.
+    at each level. To include the checks from the lower levels automatically,
-
+    select the \uicontrol {Enable lower levels automatically} check box.
-    For more information about the checks run at each level, see
-    \l{https://github.com/KDE/clazy/blob/master/README.md#list-of-checks}
-    {List of Checks} in the Clazy documentation.
 
 */

doc/src/debugger/creator-only/creator-debugger.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -180,25 +180,88 @@
 
     \section2 Launching in Start External Mode
 
-    To run any executable already present on your local or a remote machine
+    You can debug any executable already present on your local or on a remote
-    without using a project, select \uicontrol Debug >
+    machine without using a project. You specify a build and run kit that
-    \uicontrol {Start Debugging} >
+    identifies the device to debug the application on.
+
+    While this mode does not strictly require a project to be opened in \QC,
+    opening it makes setting breakpoints and stepping through the code easier.
+
+    To start and debug an external application:
+
+    \list 1
+        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Start and Debug External Application}.
+        \image qtcreator-debugger-start-external.png
+        \li In the \uicontrol Kit field, select the build and run kit to
+            use for building the project.
+        \li In the \uicontrol {Local executable} field, specify the path to the
+            application executable on the local machine.
+        \li In the \uicontrol {Command line arguments} field, specify command
+            line arguments to be passed to the executable.
+        \li In the \uicontrol {Working directory} field, specify the working
+            directory. It defaults to the directory of the build result.
+        \li Select the \uicontrol{Run in terminal} check box for console
+            applications.
+        \li Select the \uicontrol {Break at "main"} check box to stop the
+            debugger at the main function.
+        \li In the \uicontrol {Debug information} field, specify the location
+            for storing debug information. You cannot use an empty path.
+        \li In the \uicontrol Recent field, you can select a recent
+            configuration to use.
+    \endlist
 
     \section2 Launching in Attach Mode
 
-    To attach the debugger to an application already running on your local or a
+    You can attach the debugger to applications that are already running or
-    remote machine, select \uicontrol Debug > \uicontrol {Start Debugging} >
+    instruct the debugger to attach to an application when it starts.
-    \uicontrol {Attach to Running Application}, and then select a process by its
-    name or process ID to attach to.
 
-    While this mode does not strictly require a project to be opened in \QC, it
+    \section3 Attaching to Running Applications
-    is beneficial to have open one, as it makes setting breakpoints and stepping
+
-    through the code easier.
+    To attach the debugger to an application already running on your local or on
+    a remote machine:
+
+    \list 1
+        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+            \uicontrol {Attach to Running Application}.
+            \image qtcreator-debugger-attach-to-running.png
+        \li In the \uicontrol Filter field, enter a string to filter processes
+            by their process ID or name.
+        \li Select a process in the list, and then select
+            \uicontrol {Attach to Process} to start debugging.
+    \endlist
+
+    To refresh the list of running processes, select \uicontrol {Update List}.
+
+    To terminate the selected process, select \uicontrol {Kill Process}.
+
+    While this mode does not strictly require a project to be opened in \QC,
+    opening it makes setting breakpoints and stepping through the code easier.
 
     You can specify breakpoints before or after attaching the debugger to the
     application. For more information, see \l{Setting Breakpoints}.
 
+    \section3 Attaching to Processes when They Start
+
+    To instruct the debugger to watch an application process and to attach
+    to it when it starts:
+
+    \list 1
+        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+            \uicontrol {Attach to Unstarted Application}.
+            \image qtcreator-debugger-attach-to-process-not-yet-started.png
+        \li In the \uicontrol Kit field, select the build and run kit to
+            use for building the project.
+        \li In the \uicontrol Executable field, specify the path to the
+            application executable.
+        \li Select the \uicontrol {Reopen dialog when application finishes}
+            check box to return to this dialog when the application is closed.
+        \li Select the \uicontrol {Continue on attach} check box to instruct
+            the debugger to keep the application running after attaching to it.
+        \li Select \uicontrol {Start Watching} to wait for the application
+            process to start.
+    \endlist
+
     \section2 Launching in Core Mode
 
     The Core mode is used to inspect \e {core} files (crash dumps) that are
@@ -279,10 +342,29 @@
 
         \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Running Debug Server}.
-
+            \image qtcreator-debugger-attach-to-running-debug-server.png
-        \li In the \uicontrol {Host and port} field, enter the name of the remote
+        \li In the \uicontrol Kit field, select the build and run kit to
+            use for building the project.
+        \li In the \uicontrol {Server port} field, enter the name of the remote
             machine and the port number to use.
-
+        \li In the \uicontrol {Local executable} field, specify the path to the
+            application executable on the local machine.
+        \li In the \uicontrol {Command line arguments} field, specify command
+            line arguments to be passed to the executable.
+        \li In the \uicontrol {Working directory} field, specify the working
+            directory. It defaults to the directory of the build result.
+        \li Select the \uicontrol{Run in terminal} check box for console
+            applications.
+        \li Select the \uicontrol {Break at "main"} check box to stop the
+            debugger at the main function.
+        \li In the \uicontrol {Server start script} field, specify a
+            script file to run when the server starts.
+        \li In the \uicontrol {Debug information} field, specify the location
+            for storing debug information. You cannot use an empty path.
+        \li In the \uicontrol {Override server channel} field, specify a
+            communication channel to use, such as a serial line or custom port.
+        \li In the \uicontrol Recent field, you can select a recent
+            configuration to use.
         \li Select \uicontrol OK to start debugging.
 
     \endlist

doc/src/editors/creator-code-completion.qdoc

@@ -286,4 +286,16 @@
 
     \note If you now select \uicontrol OK or \uicontrol Apply, you permanently
     lose all your own snippets.
+
+    \if defined(qtcreator)
+    \section1 Completing Nim Code
+
+    You can use the \l{https://nim-lang.org/docs/nimsuggest.html}{Nimsuggest}
+    tool to query \c {.nim} source files and obtain suggestions for code
+    completion.
+
+    To use Nimsuggest, you must install it on the development PC. Then select
+    \uicontrol Tools > \uicontrol Options > \uicontrol Nim > \uicontrol Tools,
+    and enter the path to the tool executable in the \uicontrol Path field.
+    \endif
 */

doc/src/editors/creator-coding-edit-mode.qdoc

@@ -69,7 +69,7 @@
     alphabetic order.
 
     To jump to a line and column in the current file, select the line and column
-    indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on \macos) to open the
+    indicator (3) or press \key {Ctrl+K} (or \key {Cmd+K} on \macos) to open the
     locator. Enter the line number and column number in the locator, separated
     by a colon (:).
 
@@ -174,11 +174,19 @@
     \uicontrol Bookmarks > \uicontrol {Previous Bookmark} or press
     \key {Ctrl+.}.
 
+    To use the locator to go to a bookmark, press \key {Ctrl+K} (or \key {Cmd+K}
+    on \macos) to open the locator. Enter \e b and a space to display a list of
+    bookmarks. To filter the bookmarks by line number or a text string, enter
+    the number or string after the space. Double-click a bookmark in the list to
+    go to it in the editor.
+
+    \image qtcreator-locator-bookmark-filtering.png "Filtering bookmarks in locator"
+
     Bookmarks are listed in the \uicontrol Bookmarks view in the sidebar. To
     move between bookmarks, select the \uicontrol {Previous Bookmark} or
     \uicontrol {Next Bookmark} button or use the keyboard shortcuts.
 
-    \image qtcreator-bookmarks-view.png
+    \image qtcreator-bookmarks-view.png "Listing bookmarks in Bookmarks view"
 
 
     \section1 Moving to Symbol Definition or Declaration

share/qtcreator/themes/design.creatortheme

@@ -53,7 +53,7 @@ hoverBackground=ff404244
 ;blended background color for controls 1 spinboxes, background selection square for snapping modes, publish as alias icon.
 ;color for filter background and overwrite width and height boxes
 ;selectedBackground=66000000
-selectedBackground=aa1f75cc
+selectedBackground=ff111111
 
 
 ;background for default "open a document" screen in the edit mode,

src/plugins/coreplugin/manhattanstyle.cpp

@@ -608,9 +608,10 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
     case PE_IndicatorArrowDown:
     case PE_IndicatorArrowRight:
     case PE_IndicatorArrowLeft:
-        {
+        if (qobject_cast<const QMenu *>(widget)) // leave submenu arrow painting alone
+            QProxyStyle::drawPrimitive(element, option, painter, widget);
+        else
             StyleHelper::drawArrow(element, painter, option);
-        }
         break;
 
     default:

src/plugins/perfprofiler/perfdatareader.cpp

@@ -145,7 +145,7 @@ PerfDataReader::~PerfDataReader()
     qDeleteAll(m_buffer);
 }
 
-void PerfDataReader::load(const QString &filePath, const QString &executableDirPath,
+void PerfDataReader::loadFromFile(const QString &filePath, const QString &executableDirPath,
                                   ProjectExplorer::Kit *kit)
 {
     createParser(collectArguments(executableDirPath, kit) << QLatin1String("--input") << filePath);

src/plugins/perfprofiler/perfdatareader.h

@@ -48,7 +48,8 @@ public:
     explicit PerfDataReader(QObject *parent = nullptr);
     ~PerfDataReader() override;
 
-    void load(const QString &filePath, const QString &executableDirPath, ProjectExplorer::Kit *kit);
+    void loadFromFile(const QString &filePath, const QString &executableDirPath,
+                      ProjectExplorer::Kit *kit);
 
     void createParser(const QStringList &arguments);
     void startParser();

src/plugins/perfprofiler/perfprofilertracemanager.cpp

@@ -633,7 +633,7 @@ void PerfProfilerTraceManager::loadFromPerfData(const QString &filePath,
 
     reader->future().reportStarted();
     initialize();
-    reader->load(filePath, executableDirPath, kit);
+    reader->loadFromFile(filePath, executableDirPath, kit);
 }
 
 } // namespace Internal

src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp

@@ -1631,7 +1631,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
             Utils::filtered<QStringList>(result->directoriesWithWildcards.toList(),
                 [this](const QString &path) {
                     return !m_wildcardWatcher->watchesDirectory(path);
-                }), Utils::FileSystemWatcher::WatchAllChanges);
+                }), Utils::FileSystemWatcher::WatchModifiedDate);
     }
     if (m_wildcardWatcher) {
         if (result->directoriesWithWildcards.isEmpty()) {

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineview.cpp

@@ -24,6 +24,8 @@
 ****************************************************************************/
 
 #include "timelineview.h"
+
+#include "easingcurve.h"
 #include "timelinecontext.h"
 #include "timelinewidget.h"
 
@@ -57,7 +59,9 @@ namespace QmlDesigner {
 
 TimelineView::TimelineView(QObject *parent)
     : AbstractView(parent)
-{}
+{
+    EasingCurve::registerStreamOperators();
+}
 
 TimelineView::~TimelineView() = default;