Merge "Merge remote-tracking branch 'origin/4.0'"

doc/src/analyze/cpu-usage-analyzer.qdoc

@@ -245,13 +245,21 @@
     functions that spend the most CPU time most prominently.
 
     If a function without debug information is encountered, further unwinding
-    of the stack may fail. Unwinding will also fail if a QML or JavaScript
-    function is encountered, and for some symbols implemented in assembler. If
-    unwinding fails, only part of the call chain is displayed, and the
-    surrounding functions may seem to be interrupted. This does not necessarily
-    mean they were actually interrupted during the execution of the
-    application, but only that they could not be found in the stacks where the
-    unwinding failed.
+    of the stack may fail. Unwinding will also fail for some symbols
+    implemented in assembly language. If unwinding fails, only a part of the
+    call chain is displayed, and the surrounding functions may seem to be
+    interrupted. This does not necessarily mean they were actually interrupted
+    during the execution of the application, but only that they could not be
+    found in the stacks where the unwinding failed.
+
+    JavaScript functions from the QML engine running in the JIT mode can be
+    unwound. However, their names will only be displayed when
+    \c QV4_PROFILE_WRITE_PERF_MAP is set. Compiled JavaScript generated by the
+    \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler} can also be
+    unwound. In this case the C++ names generated by the compiler are shown for
+    JavaScript functions, rather than their JavaScript names. When running in
+    interpreted mode, stack frames involving QML can also be unwound, showing
+    the interpreter itself, rather than the interpreted JavaScript.
 
     Kernel functions included in call chains are shown on the third row of each
     thread. All kernel functions are summarized and not differentiated any

doc/src/analyze/creator-valgrind-overview.qdoc

@@ -59,9 +59,6 @@
     For more information about analyzing applications for which you do not have
     a project, see \l{Running Valgrind Tools on External Applications}.
 
-    To stop the currently running analyzer, select \uicontrol {Analyze
-    > Stop}.
-
     To select options for the Valgrind tools, select \uicontrol {Tools > Options >
     Analyzer}. You can override the general settings for each project in the
     \uicontrol {Run Settings} for the project.

doc/src/analyze/creator-valgrind.qdoc

@@ -54,9 +54,8 @@
 
         \li In the \uicontrol Projects mode, select a debug build configuration.
 
-        \li Select \uicontrol Analyze > \uicontrol {Valgrind Memory Analyzer},
-            or \uicontrol {Valgrind Memory Analyzer with GDB} if you want to
-            debug the found problems.
+        \li Select \uicontrol Debug to open the \uicontrol Debug mode, and then
+            select \uicontrol Memcheck on the toolbar.
 
         \li Select the
             \inlineimage qtcreator-analyze-start-button.png "Start button"
@@ -73,11 +72,11 @@
 
     While the application is running, Memcheck checks all reads and writes of
     memory and intercepts calls that allocate or free memory or create or
-    delete memory blocks. When you stop Memcheck, it displays the results in
-    the \uicontrol Analysis view. Click a line to view where a memory leak
+    delete memory blocks. The results are displayed when you stop Memcheck.
+    Click a line to view where a memory leak
     occurred and a stack trace that shows what caused it.
 
-    \image analyzer-issues.png "Analysis view"
+    \image qtcreator-valgrind-memcheck.png "Memcheck view"
 
     Move the mouse on a row to view more information about the function.
 
@@ -93,9 +92,8 @@
 
     Stack traces can get quite large and confusing, and therefore, reading them
     from the bottom up can help. If the stack trace is not big enough or it is
-    too big, select \uicontrol {Tools > Options > Analyzer}.
-    Define the length of the stack trace in the \uicontrol {Backtrace frame count}
-    field.
+    too big, select \uicontrol {Tools > Options > Analyzer} and define the
+    length of the stack trace in the \uicontrol {Backtrace frame count} field.
 
     \image qtcreator-valgrind-memcheck-options.png "Memory Analysis options"
 
@@ -164,7 +162,8 @@
 
         \li In the \uicontrol Projects mode, select a release build configuration.
 
-        \li Select \uicontrol Analyze > \uicontrol {Valgrind Function Profiler}.
+        \li Select \uicontrol Debug to open the \uicontrol Debug mode, and then
+            select \uicontrol Callgrind on the toolbar.
 
         \li Select the
             \inlineimage qtcreator-analyze-start-button.png "Start button"
@@ -192,17 +191,17 @@
 
     Since the run-time characteristics of debug and release
     \l{glossary-build-config}{build configurations}
-    differ significantly, analytical findings for one build configuration may or
+    differ significantly, analytical findings for one build configuration may
     not be relevant for the other. Profiling a debug build
     often finds a major part of the time being spent in low-level
-    code like container implementations, while the same code
+    code, such as container implementations, while the same code
     does not show up in the profile of a release build of the
     same application due to inlining and other optimizations
     typically done there.
 
     Many recent compilers allow you to build an optimized application
-    with debug information present at the same time. Typical
-    options for GCC are for instance \c{-g -O2}. It is
+    with debug information present at the same time. For example, typical
+    options for GCC are: \c{-g -O2}. It is
     advisable to use such a setup for Callgrind profiling.
 
 
@@ -279,7 +278,7 @@
         \li Select \uicontrol Analyze > \uicontrol {Valgrind Memory Analyzer (External
             Application)} or \uicontrol {Valgrind Function Profiler (External Application)}.
 
-            \image qtcreator-valgrind-remote-settings.png "Start Analyzer dialog"
+            \image qtcreator-valgrind-remote-settings.png "Start Remote Analysis dialog"
 
         \li Specify the application to run and analyze, and the \l{glossary-buildandrun-kit}{kit}
             to use.

doc/src/analyze/qtquick-profiler.qdoc

@@ -128,9 +128,9 @@
     select \uicontrol Tools > \uicontrol Options > \uicontrol Analyzer.
 
     To specify custom QML Profiler settings for a particular project, select
-    \uicontrol Projects and then select \uicontrol Custom in \uicontrol
-    {QML Profiler Settings}. To restore the global settings for the project,
-    select \uicontrol {Restore Global}.
+    \uicontrol Projects > \uicontrol Run and then select \uicontrol Custom in
+    \uicontrol {QML Profiler Settings}. To restore the global settings for the
+    project, select \uicontrol {Restore Global}.
 
     \image qml-profiler-settings.png "QML Profiler Settings"
 
@@ -145,6 +145,11 @@
     application, potentially wasting memory. However, the flushing itself takes
     time, which can distort the profiling results.
 
+    If you have multiple QML engines and you want to aggregate the data produced
+    by all of them into one trace, select the \uicontrol {Process data only when
+    process ends} check box. Otherwise, the profiling stops when one of the
+    engines stops.
+
     \section1 Attaching to Running Qt Quick Applications
 
     To profile Qt Quick applications that are not launched by \QC, select

doc/src/debugger/qtquick-debugger-example.qdoc

@@ -63,8 +63,10 @@
         \li Select \uicontrol {Debug > Start Debugging > Start Debugging} or press
             \key{F5}.
 
-        \li Once the Same Game application starts, click the \uicontrol {New Game}
-            button to start a new game.
+        \li Once the Same Game application starts, select \uicontrol {1 Player}
+            to start a new game.
+
+            \image samegame.png
 
         \li When the debugger hits the breakpoint, it interrupts the
             application. \QC displays the nested function calls leading to the
@@ -93,10 +95,7 @@
         \li To execute JavaScript commands in the current context, open the
             \uicontrol {Debugger Console} output pane.
 
-        \li To change the score to 1000, enter \c{gameCanvas.score = 1000}
-            in the console.
-
-            \image qtquick-example-script-console.png
+            \image qml-script-console.png
 
         \li To remove a breakpoint, right-click it and select
             \uicontrol {Delete Breakpoint}.
@@ -106,25 +105,16 @@
 
             \image qtquick-example-qml-inspector.png
 
-        \li Click
-            \inlineimage qml-inspector-app-on-top.png
-            (\uicontrol {Show Application on Top}) to keep the application visible
-            while you interact with the debugger.
+        \li Select \uicontrol Debug > \uicontrol {Show Application on Top} to
+            keep the application visible while you interact with the debugger.
 
-        \li Click
-            \inlineimage qml-inspector-select-button.png
-            (\uicontrol Select) to activate selection mode and then click the
-            \uicontrol {Quit} button to move into the \uicontrol ButtonLabel component
-            in the \uicontrol {Locals and Expressions} and the code editor.
+        \li Select \uicontrol Debug > \uicontrol Select to activate selection
+            mode and then click the \uicontrol Menu button to move into the
+            \uicontrol menuButton component in the
+            \uicontrol {Locals and Expressions} view and the code editor.
 
-        \li In the \uicontrol {Locals and Expressions} view, double-click the value of
-            the \c text property to change it temporarily from \uicontrol {Quit} to
-            \uicontrol {End Game}.
-
-            \image qtquick-example-property-values.png
-
-            When you select an element, the cursor moves to it in the code
-            editor, where you can change the value permanently.
+        \li In the \uicontrol {Locals and Expressions} view, double-click the
+            value of a property to change it.
 
     \endlist
 

doc/src/debugger/qtquick-debugging.qdoc

@@ -186,9 +186,8 @@
 
     \image qml-observer-view.png "QML item tree"
 
-    To keep the application visible while you interact with the debugger, click
-    \inlineimage qml-inspector-app-on-top.png
-    (\uicontrol {Show Application on Top}).
+    To keep the application visible while you interact with the debugger, select
+    \uicontrol Debug > \uicontrol {Show Application on Top}.
 
     You can view a QML item in \uicontrol {Locals and Expressions} in the following
     ways:
@@ -199,10 +198,8 @@
 
         \li Select the item in the code editor.
 
-        \li Click
-            \inlineimage qml-inspector-select-button.png
-            (\uicontrol Select) to activate selection mode and then click an item
-            in the running application.
+        \li Select \uicontrol Debug > \uicontrol Select to activate selection
+            mode and then click an item in the running application.
 
     \endlist
 
@@ -215,7 +212,7 @@
     When you debug complex applications, you can jump to the position in code
     where an item is defined or you can zoom into the user interface.
 
-    When the \uicontrol Select tool is enabled, you can click items in the running
+    In the selection mode, you can click items in the running
     application to jump to their definitions in the code. The properties of the
     selected item are displayed in the \uicontrol {Locals and Expressions} view.
 
@@ -238,14 +235,9 @@
 
     \endlist
 
-    To switch to the zoom mode, click the \uicontrol Zoom button. Click in the
-    running application to zoom in. Right-click to open a context menu that
-    contains zoom controls.
+    To switch out of the selection mode, toggle the \uicontrol Select menu item.
 
-    To switch out of the selection or zoom mode, deselect the \uicontrol Select or
-    \uicontrol Zoom button.
-
-    To move the application running in \QQV to the front, select the
-    \uicontrol {Show Application on Top} button.
+    To move the application running in \QQV to the front, select
+    \uicontrol Debug > \uicontrol {Show Application on Top}.
 
 */

doc/src/howto/creator-help.qdoc

@@ -197,15 +197,17 @@
     space, the help opens in the full-screen help mode.
 
     You can specify that the help always opens in full-screen mode or
-    is detached to an external window. Select \uicontrol {Tools > Options > Help >
-    General Settings} and specify settings for displaying context-sensitive help
+    is detached to an external window. Select \uicontrol Tools >
+    \uicontrol Options > \uicontrol Help > \uicontrol General and specify
+    settings for displaying context-sensitive help
     in the \uicontrol {On context help} field. To detach the help window, select
-    \uicontrol {Always Show Help in External Window}.
+    \uicontrol {Always Show in External Window}.
 
     \section1 Selecting the Start Page
 
     You can select the page to display when you open the \uicontrol Help mode in the
-    \uicontrol {Tools > Options > Help > General Settings > On help start} field.
+    \uicontrol Tools > \uicontrol Options > \uicontrol Help > \uicontrol General
+    > \uicontrol {On help start} field.
     To display the page and help panes that were open when you exited the mode,
     select the \uicontrol {Show My Tabs from Last Session} option. However, Web pages
     are not opened, because loading them would slow down opening the \uicontrol Help
@@ -221,8 +223,8 @@
     \section1 Using Documentation Filters
 
     You can filter the documents displayed in the \uicontrol Help mode to find
-    relevant information faster. Select from a list of filters in the
-    \uicontrol {Filtered by} field (1). The contents of the \uicontrol Index and \uicontrol Contents
+    relevant information faster. Select a filter from a list of filters (1). The
+    contents of the \uicontrol Index and \uicontrol Contents
     pane in the sidebar change accordingly.
 
     \image qtcreator-help-filters.png "Help filters"
@@ -249,8 +251,8 @@
 
         \li Click \uicontrol OK.
 
-        \li In the \uicontrol Help mode, select the filter in the \uicontrol {Filtered by}
-            field to see the filtered documentation in the sidebar.
+        \li In the \uicontrol Help mode, select the filter in the list of
+            filters to see the filtered documentation in the sidebar.
 
     \endlist
 

doc/src/projects/creator-projects-qbs.qdoc

@@ -40,6 +40,9 @@
     with the build and run kit. \QC automatically creates a Qbs profile for each
     kit. You can edit the build profiles by adding new keys and values.
 
+    To check which Qbs version is being used, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol Qbs > \uicontrol {Version Info}.
+
     \section1 Building Qbs
 
     If you build \QC yourself from the \QC Git repository, you also need to
@@ -60,10 +63,22 @@
 
     \list 1
 
-        \li Select \uicontrol File > \uicontrol {New File or Project} > \uicontrol {Plain C
-            Project (Qbs Build)} or \uicontrol {Plain C++ Project (Qbs Build)} >
-            \uicontrol Choose, and follow the instructions of the wizard to create a
-            Qbs project.
+        \li Select \uicontrol File > \uicontrol {New File or Project} >
+            \uicontrol {Non-Qt Project} > \uicontrol {Plain C Project} or
+            \uicontrol {Plain C++ Project} > \uicontrol Choose.
+
+        \li In the \uicontrol {Project Location} dialog, specify the name and
+            location for the project and select \uicontrol Next.
+
+        \li In the \uicontrol {Define Build System} dialog, select
+            \uicontrol Qbs in the \uicontrol {Build system} field, and then
+            select \uicontrol Next.
+
+        \li In the \uicontrol {Kit Selection} dialog, select a build and run kit
+            for the project, and then select \uicontrol Next.
+
+        \li In the \uicontrol {Project Management} dialog, select
+            \uicontrol Finish to create a Qbs project.
 
             \image creator-qbs-project.png
 
@@ -133,9 +148,6 @@
 
             \list
 
-                \li Select \uicontrol {Clean all artifacts} to remove all build
-                    artifacts.
-
                 \li Select \uicontrol {Dry run} to test cleaning without executing
                     commands or making permanent changes to the build graph.
 
@@ -165,6 +177,13 @@
 
         \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Qbs.
 
+        \li By default, Qbs profiles are stored in the \c qbs directory in the
+            \QC settings directory to ensure that different \QC instances do not
+            overwrite each other's profiles. If you only run one \QC instance,
+            you can store the profiles in the Qbs settings directory instead,
+            by deselecting the \uicontrol {Store profiles in Qt Creator settings
+            directory} check box.
+
         \li In the \uicontrol Kit field, select a build and run kit.
 
         \li Select \uicontrol Edit to edit the profile associated with the kit.

qtcreator.pri

@@ -173,7 +173,7 @@ unix {
     UI_DIR = $${OUT_PWD}/.uic
 }
 
-win32-msvc* {
+msvc {
     #Don't warn about sprintf, fopen etc being 'unsafe'
     DEFINES += _CRT_SECURE_NO_WARNINGS
     QMAKE_CXXFLAGS_WARN_ON *= -w44996

share/qtcreator/debugger/qttypes.py

@@ -101,10 +101,10 @@ def qdump__QChar(d, value):
     d.putNumChild(0)
 
 
-def qform__QAbstractItemModel():
+def qform_X_QAbstractItemModel():
     return [SimpleFormat, EnhancedFormat]
 
-def qdump__QAbstractItemModel(d, value):
+def qdump_X_QAbstractItemModel(d, value):
     displayFormat = d.currentItemFormat()
     if displayFormat == SimpleFormat:
         d.putPlainChildren(value)

share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json

@@ -42,6 +42,7 @@
         "QtQuick.Controls 1.2",
         "QtQuick.Controls 1.3",
         "QtQuick.Controls 1.4",
+        "QtQuick.Controls 2.0",
         "QtQuick.Controls.Styles 1.0",
         "QtQuick.Controls.Styles 1.1",
         "QtQuick.Controls.Styles 1.2",
@@ -55,6 +56,7 @@
         "QtQuick.Layouts 1.1",
         "QtQuick.LocalStorage 2.0",
         "QtQuick.Particles 2.0",
+        "QtQuick.Templates 2.0",
         "QtQuick.Window 2.0",
         "QtQuick.XmlListModel 2.0",
         "QtSensors 5.3",

src/libs/3rdparty/botan/botan.pri

@@ -34,7 +34,7 @@ win32 {
         BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
         BOTAN_HAS_MUTEX_WIN32
 
-    win32-msvc* {
+    msvc {
         QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs
         QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 -wd4297 -wd4267 -wd4334
         DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS

src/libs/clangbackendipc/cmbendmessage.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "clangbackendipc_global.h"
+#include <ostream>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/highlightingmarkcontainer.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "clangbackendipc_global.h"
+#include <ostream>
 
 namespace ClangBackEnd {
 

src/libs/cplusplus/LookupContext.cpp

@@ -88,10 +88,10 @@ static bool isNestedInstantiationEnclosingTemplate(
         ClassOrNamespace *nestedClassOrNamespaceInstantiation,
         ClassOrNamespace *enclosingTemplateClassInstantiation)
 {
-    QList<ClassOrNamespace *> processed;
+    QSet<ClassOrNamespace *> processed;
     while (enclosingTemplateClassInstantiation
            && !processed.contains(enclosingTemplateClassInstantiation)) {
-        processed.append(enclosingTemplateClassInstantiation);
+        processed.insert(enclosingTemplateClassInstantiation);
         if (enclosingTemplateClassInstantiation == nestedClassOrNamespaceInstantiation)
             return false;
         enclosingTemplateClassInstantiation = enclosingTemplateClassInstantiation->parent();
@@ -454,8 +454,13 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const
                     candidates = binding->find(name);
 
                     // try find this name in parent class
-                    while (candidates.isEmpty() && (binding = binding->parent()))
+                    QSet<ClassOrNamespace *> processed;
+                    while (candidates.isEmpty() && (binding = binding->parent())) {
+                        if (processed.contains(binding))
+                            break;
+                        processed.insert(binding);
                         candidates = binding->find(name);
+                    }
 
                     if (! candidates.isEmpty())
                         return candidates;
@@ -1143,8 +1148,13 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac
             instantiation->_name = templId;
         instantiation->_templateId = templId;
 
-        while (!origin->_symbols.isEmpty() && origin->_symbols[0]->isBlock())
+        QSet<ClassOrNamespace *> processed;
+        while (!origin->_symbols.isEmpty() && origin->_symbols[0]->isBlock()) {
+            if (processed.contains(origin))
+                break;
+            processed.insert(origin);
             origin = origin->parent();
+        }
 
         instantiation->_instantiationOrigin = origin;
 

src/libs/cplusplus/OverviewModel.cpp

@@ -140,6 +140,9 @@ int OverviewModel::columnCount(const QModelIndex &) const
 
 QVariant OverviewModel::data(const QModelIndex &index, int role) const
 {
+    if (!index.isValid())
+        return QVariant();
+
     // account for no symbol item
     if (!index.parent().isValid() && index.row() == 0) {
         switch (role) {
@@ -243,7 +246,9 @@ void OverviewModel::rebuild(Document::Ptr doc)
 
 Qt::ItemFlags OverviewModel::flags(const QModelIndex &index) const
 {
-    Q_UNUSED(index)
+    if (!index.isValid())
+        return 0;
+
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
 }
 

src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp

@@ -62,10 +62,12 @@ void AssociationItem::update(const Style *style)
 
     QMT_CHECK(m_arrow);
     QGraphicsItem *endAItem = m_diagramSceneModel->graphicsItem(m_association->endAUid());
-    QMT_CHECK(endAItem);
+    if (!endAItem)
+        return;
     placeEndLabels(m_arrow->firstLineSegment(), m_endAName, m_endACardinality, endAItem, m_arrow->startHeadLength());
     QGraphicsItem *endBItem = m_diagramSceneModel->graphicsItem(m_association->endBUid());
-    QMT_CHECK(endBItem);
+    if (!endBItem)
+        return;
     placeEndLabels(m_arrow->lastLineSegment(), m_endBName, m_endBCardinality, endBItem, m_arrow->endHeadLength());
 }
 

src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp

@@ -492,7 +492,8 @@ QPointF RelationItem::calcEndPoint(const Uid &end, const Uid &otherEnd, int near
 QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &otherEndPos, int nearestIntermediatePointIndex)
 {
     QGraphicsItem *endItem = m_diagramSceneModel->graphicsItem(end);
-    QMT_CHECK(endItem);
+    if (!endItem)
+        return QPointF(0, 0);
     auto endObjectItem = dynamic_cast<IIntersectionable *>(endItem);
     QPointF endPos;
     if (endObjectItem) {

src/libs/qtcreatorcdbext/cdb_detect.pri

@@ -2,7 +2,7 @@
 # in case MS VS compilers are used.
 
 CDB_PATH=""
-win32-msvc*|winrt {
+msvc {
     CDB_PATH="$$(CDB_PATH)"
     isEmpty(CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk"
     !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x86)/sdk"

src/libs/sqlite/sqlite-lib.pri

@@ -6,7 +6,7 @@ contains(CONFIG, dll) {
 
 INCLUDEPATH += $$PWD
 
-unix:!openbsd: LIBS += -ldl
+unix:!bsd: LIBS += -ldl
 
 include(../3rdparty/sqlite/sqlite.pri)
 

src/libs/sqlite/sqlite.qbs

@@ -13,7 +13,7 @@ QtcLibrary {
         "SQLITE_ENABLE_COLUMN_METADATA"
     ])
     cpp.optimization: "fast"
-    cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("openbsd"))
+    cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd"))
                                       ? ["dl", "pthread"] : [])
 
 

src/libs/ssh/ssh.qbs

@@ -7,6 +7,7 @@ QtcLibrary {
     cpp.defines: base.concat(["QSSH_LIBRARY"]).concat(botanDefines)
     cpp.includePaths: botanIncludes
     cpp.dynamicLibraries: botanLibs
+    cpp.enableExceptions: true
 
     Depends { name: "Qt"; submodules: ["widgets", "network" ] }
 

src/libs/utils/process_stub_win.c

@@ -23,6 +23,7 @@
 **
 ****************************************************************************/
 
+#undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501 /* WinXP, needed for DebugActiveProcessStop() */
 
 #include <windows.h>

src/libs/utils/treemodel.h

@@ -246,7 +246,7 @@ class QTCREATOR_UTILS_EXPORT TreeModel : public QAbstractItemModel
 public:
     explicit TreeModel(QObject *parent = 0);
     explicit TreeModel(TreeItem *root, QObject *parent = 0);
-    ~TreeModel();
+    ~TreeModel() override;
 
     void setHeader(const QStringList &displays);
     void setHeaderToolTip(const QStringList &tips);
@@ -258,19 +258,19 @@ public:
     QModelIndex indexForItem(const TreeItem *needle) const;
 
     int topLevelItemCount() const;
-    int rowCount(const QModelIndex &idx = QModelIndex()) const;
-    int columnCount(const QModelIndex &idx) const;
+    int rowCount(const QModelIndex &idx = QModelIndex()) const override;
+    int columnCount(const QModelIndex &idx) const override;
 
-    bool setData(const QModelIndex &idx, const QVariant &data, int role);
-    QVariant data(const QModelIndex &idx, int role) const;
-    QModelIndex index(int, int, const QModelIndex &idx = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &idx) const;
-    Qt::ItemFlags flags(const QModelIndex &idx) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-    bool hasChildren(const QModelIndex &idx) const;
+    bool setData(const QModelIndex &idx, const QVariant &data, int role) override;
+    QVariant data(const QModelIndex &idx, int role) const override;
+    QModelIndex index(int, int, const QModelIndex &idx = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &idx) const override;
+    Qt::ItemFlags flags(const QModelIndex &idx) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    bool hasChildren(const QModelIndex &idx) const override;
 
-    bool canFetchMore(const QModelIndex &idx) const;
-    void fetchMore(const QModelIndex &idx);
+    bool canFetchMore(const QModelIndex &idx) const override;
+    void fetchMore(const QModelIndex &idx) override;
 
     template <class T>
     TreeLevelItems<T> itemsAtLevel(int level, TreeItem *start = 0) const

src/libs/utils/utils.qbs

@@ -22,6 +22,8 @@ QtcLibrary {
         return libs;
     }
 
+    cpp.enableExceptions: true
+
     Properties {
         condition: qbs.targetOS.contains("osx")
         cpp.frameworks: ["Foundation"]

src/plugins/android/androidconfigurations.cpp

@@ -917,7 +917,7 @@ QString AndroidConfig::getAvdName(const QString &serialnumber)
     if (!ok)
         return QString();
 
-    QByteArray avdName = "avd name\n";
+    const QByteArray avdName = "avd name\n";
 
     QTcpSocket tcpSocket;
     tcpSocket.connectToHost(QHostAddress(QHostAddress::LocalHost), port);
@@ -925,16 +925,15 @@ QString AndroidConfig::getAvdName(const QString &serialnumber)
     tcpSocket.write(avdName + "exit\n");
     tcpSocket.waitForDisconnected();
 
-    QByteArray response = tcpSocket.readAll();
-    int start = response.indexOf("OK\r\n");
-    if (start == -1)
-        return QString();
-    start = start + 4;
-
-    int end = response.indexOf("\r\n", start);
-    if (end == -1)
-        return QString();
-    return QString::fromLatin1(response.mid(start, end - start));
+    QByteArray name;
+    const QByteArrayList response = tcpSocket.readAll().split('\n');
+    // The input "avd name" might not be echoed as-is, but contain ASCII
+    // control sequences.
+    for (int i = response.size() - 1; i > 1; --i) {
+        if (response.at(i).startsWith("OK"))
+            name = response.at(i - 1);
+    }
+    return QString::fromLatin1(name).trimmed();
 }
 
 AndroidConfig::OpenGl AndroidConfig::getOpenGLEnabled(const QString &emulator) const
@@ -1288,6 +1287,7 @@ void AndroidConfigurations::updateAutomaticKitList()
             debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
             debugger.setAutoDetected(true);
             debugger.setAbi(tc->targetAbi());
+            debugger.reinitializeFromFile();
             QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
             Debugger::DebuggerKitInformation::setDebugger(k, id);
         }
@@ -1334,6 +1334,7 @@ void AndroidConfigurations::updateAutomaticKitList()
             debugger.setUnexpandedDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
             debugger.setAutoDetected(true);
             debugger.setAbi(tc->targetAbi());
+            debugger.reinitializeFromFile();
             QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger);
             Debugger::DebuggerKitInformation::setDebugger(newKit, id);
 

src/plugins/android/androiddebugsupport.cpp

@@ -92,11 +92,12 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
     params.startMode = AttachToRemoteServer;
     params.displayName = AndroidManager::packageName(target);
     params.remoteSetupNeeded = true;
+    params.useContinueInsteadOfRun = true;
 
     auto aspect = runConfig->extraAspect<DebuggerRunConfigurationAspect>();
     if (aspect->useCppDebugger()) {
         Kit *kit = target->kit();
-        params.inferior.executable = target->activeBuildConfiguration()->buildDirectory().toString()
+        params.symbolFile = target->activeBuildConfiguration()->buildDirectory().toString()
                                      + QLatin1String("/app_process");
         params.skipExecutableValidation = true;
         params.remoteChannel = runConfig->remoteChannel();

src/plugins/android/androiddeployqtstep.cpp

@@ -354,7 +354,7 @@ AndroidDeployQtStep::DeployResult AndroidDeployQtStep::runDeploy(QFutureInterfac
                    .arg(QDir::toNativeSeparators(m_command), args),
                    BuildStep::MessageOutput);
 
-    while (!m_process->waitForFinished(200)) {
+    while (m_process->state() != QProcess::NotRunning && !m_process->waitForFinished(200)) {
         if (fi.isCanceled()) {
             m_process->kill();
             m_process->waitForFinished();

src/plugins/android/androidrunner.cpp

@@ -249,13 +249,19 @@ static int extractPid(const QString &exeName, const QByteArray &psOutput)
 
 QByteArray AndroidRunner::runPs()
 {
-    QByteArray psLine("ps");
-    if (m_isBusyBox)
-        psLine += " -w";
-    psLine += '\n';
-    m_psProc.write(psLine);
-    m_psProc.waitForBytesWritten(psLine.size());
-    return m_psProc.readAllStandardOutput();
+    if (QThread::currentThread() != thread()) {
+        QByteArray ret;
+        QMetaObject::invokeMethod(this, "runPs", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QByteArray, ret));
+        return ret;
+    } else {
+        QByteArray psLine("ps");
+        if (m_isBusyBox)
+            psLine += " -w";
+        psLine += '\n';
+        m_psProc.write(psLine);
+        m_psProc.waitForBytesWritten(psLine.size());
+        return m_psProc.readAllStandardOutput();
+    }
 }
 
 void AndroidRunner::checkPID()

src/plugins/android/androidrunner.h

@@ -79,12 +79,12 @@ private slots:
     void logcatReadStandardError();
     void logcatReadStandardOutput();
     void asyncStart();
+    QByteArray runPs();
 
 private:
     void adbKill(qint64 pid);
     QStringList selector() const { return m_selector; }
     void forceStop();
-    QByteArray runPs();
     void findPs();
     void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
     bool adbShellAmNeedsQuotes();

src/plugins/autotest/testvisitor.cpp

@@ -63,6 +63,7 @@ bool TestVisitor::visit(CPlusPlus::Class *symbol)
 {
     const CPlusPlus::Overview o;
     CPlusPlus::LookupContext lc;
+    const CPlusPlus::Snapshot snapshot = CppTools::CppModelManager::instance()->snapshot();
 
     unsigned count = symbol->memberCount();
     for (unsigned i = 0; i < count; ++i) {
@@ -81,7 +82,7 @@ bool TestVisitor::visit(CPlusPlus::Class *symbol)
                 TestCodeLocationAndType locationAndType;
 
                 CPlusPlus::Function *functionDefinition = m_symbolFinder.findMatchingDefinition(
-                            func, CppTools::CppModelManager::instance()->snapshot(), true);
+                            func, snapshot, true);
                 if (functionDefinition && functionDefinition->fileId()) {
                     locationAndType.m_name = QString::fromUtf8(functionDefinition->fileName());
                     locationAndType.m_line = functionDefinition->line();
@@ -203,6 +204,26 @@ bool TestDataFunctionVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
     return false;
 }
 
+QString TestDataFunctionVisitor::extractNameFromAST(CPlusPlus::StringLiteralAST *ast, bool *ok) const
+{
+    auto token = m_currentDoc->translationUnit()->tokenAt(ast->literal_token);
+    if (!token.isStringLiteral()) {
+        *ok = false;
+        return QString();
+    }
+    *ok = true;
+    QString name = QString::fromUtf8(token.spell());
+    if (ast->next) {
+        CPlusPlus::StringLiteralAST *current = ast;
+        do {
+            auto nextToken = m_currentDoc->translationUnit()->tokenAt(current->next->literal_token);
+            name.append(QString::fromUtf8(nextToken.spell()));
+            current = current->next;
+        } while (current->next);
+    }
+    return name;
+}
+
 bool TestDataFunctionVisitor::visit(CPlusPlus::CallAST *ast)
 {
     if (m_currentFunction.isEmpty())
@@ -214,15 +235,15 @@ bool TestDataFunctionVisitor::visit(CPlusPlus::CallAST *ast)
             // first argument is the one we need
             if (const auto argumentExpressionAST = expressionListAST->value) {
                 if (const auto stringLiteral = argumentExpressionAST->asStringLiteral()) {
-                    auto token = m_currentDoc->translationUnit()->tokenAt(
-                                stringLiteral->literal_token);
-                    if (token.isStringLiteral()) {
+                    bool ok = false;
+                    QString name = extractNameFromAST(stringLiteral, &ok);
+                    if (ok) {
                         unsigned line = 0;
                         unsigned column = 0;
                         m_currentDoc->translationUnit()->getTokenStartPosition(
                                     firstToken, &line, &column);
                         TestCodeLocationAndType locationAndType;
-                        locationAndType.m_name = QString::fromUtf8(token.spell());
+                        locationAndType.m_name = name;
                         locationAndType.m_column = column - 1;
                         locationAndType.m_line = line;
                         locationAndType.m_type = TestTreeItem::TestDataTag;

src/plugins/autotest/testvisitor.h

@@ -94,6 +94,7 @@ public:
     QMap<QString, TestCodeLocationList> dataTags() const { return m_dataTags; }
 
 private:
+    QString extractNameFromAST(CPlusPlus::StringLiteralAST *ast, bool *ok) const;
     bool newRowCallFound(CPlusPlus::CallAST *ast, unsigned *firstToken) const;
 
     CPlusPlus::Document::Ptr m_currentDoc;