Merge remote-tracking branch 'origin/4.3'

Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0

doc/src/editors/creator-editors.qdoc

@@ -1608,6 +1608,10 @@
 
                 \li \uicontrol {Open Documents} searches from all open files.
 
+                \li \uicontrol {Clang Query Project} explores the Clang abstract
+                     syntax tree (AST) using AST matcher expressions. For more
+                     information, see \l{Exploring Clang AST}.
+
             \endlist
 
         \li In the \uicontrol {File pattern} field, specify file patterns to
@@ -1672,6 +1676,34 @@
             \uicontrol {Search engine} field.
 
     \endlist
+
+    \section1 Exploring Clang AST
+
+    You can use the experimental Clang Refactoring plugin to explore the Clang
+    AST using AST matcher expressions. For more information about constructing
+    matcher expressions, see
+    \l {http://clang.llvm.org/docs/LibASTMatchersReference.html}
+    {AST Matcher Reference}.
+
+    To explore the AST:
+
+    \list 1
+
+        \li Select \uicontrol Help > \uicontrol {About Plugins} > \uicontrol C++
+            > \uicontrol {ClangRefactoring} to enable the plugin.
+
+        \li Restart \QC to be able to use the plugin.
+
+        \li When searching, select \uicontrol {Clang Query Project} in the
+            \uicontrol {Scope} field.
+
+        \li Enter an AST matcher expression in the \uicontrol {Search for}
+            field.
+
+    \endlist
+
+    You can view the results of the query as links to code positions in the
+    \uicontrol {Search Results} output pane.
 */
 
 
@@ -2473,8 +2505,14 @@
 
         \row
             \li Move Component into Separate File
-            \li Moves a QML type into a separate file
-            \li QML type name
+            \li Moves a QML type into a separate file. Give the new component a
+                name and select whether properties are set for the new component
+                or for the original one.
+
+                \image qtcreator-move-component-into-separate-file.png
+
+            \li QML type name. This action is also available in the
+                \uicontrol {Form Editor} in \QMLD.
         \row
             \li Split Initializer
             \li Reformats a one-line type into a multi-line type. For example,

doc/src/qtquick/creator-mobile-app-tutorial.qdoc

@@ -123,12 +123,11 @@
 
     \list 1
 
-        \li Select \uicontrol {Text Editor} to open Page1Form.ui.qml in the
-            text editor tab.
-
-        \li Right-click \uicontrol Image and select \uicontrol Refactoring >
+        \li Right-click the image and select
             \uicontrol {Move Component into Separate File}.
 
+            \image qtcreator-move-component-into-separate-file.png
+
         \li In the \uicontrol {Component name} field, enter \e Bubble.
 
         \li Deselect the \uicontrol x, \uicontrol y, and

doc/src/qtquick/qtquick-components.qdoc

@@ -78,28 +78,40 @@
 
     \endlist
 
-    You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
+    \section1 Using Qt Quick Controls
+
+    In Qt 4, ready-made Qt Quick 1 Components were provided for creating
     screens with a native look and feel for a particular target platform.
-    Since Qt 5.1, Qt Quick Controls, Dialogs, and Layouts are available for
-    creating classic desktop-style user interfaces using Qt Quick 2.1. You can
-    use the Qt Quick Controls Styles to customize Qt Quick Controls.
+    In Qt 5.1, Qt Quick Controls, Dialogs, and Layouts were added for
+    creating classic desktop-style user interfaces using Qt Quick 2.1. The
+    Qt Quick Controls Styles could be used to customize Qt Quick Controls.
 
     Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
-    Qt Labs Controls. These Controls provide lightweight QML types for creating
-    performant user interfaces for embedded and mobile devices. These controls
-    achieve improved efficiency by employing a simplified styling architecture
-    when compared to Qt Quick Controls, on which the module is based. These
-    types work in conjunction with Qt Quick and Qt Quick Layouts.
+    Qt Labs Controls. They provide lightweight QML types for creating performant
+    user interfaces for embedded and mobile devices.
+
+    Qt Quick Controls 2 achieve improved efficiency by employing a simplified
+    \l {Styling Qt Quick Controls 2}{styling architecture} when compared to
+    Qt Quick Controls, on which the module is based. \QMLD reads the
+    \c qtquickcontrols2.conf file that specifies the preferred style and some
+    style-specific arguments. To change the style, select another style from
+    the list on the toolbar. This enables you to check how your UI looks when
+    using the available styles.
+
+    For an example of defining your own style and using it in \QMLD, see
+    \l {Qt Quick Controls 2 - Flat Style}.
+
+    Qt Quick Controls 2 work in conjunction with Qt Quick and Qt Quick Layouts.
+
+    The \QC project wizards create Qt Quick applications that use Qt Quick
+    2 types or Qt Quick Controls 2 types.
+
+    Even if you use Qt Quick Controls 2, you can still write cross-platform
+    applications, by using different sets of QML files for each platform.
 
     Some ready-made controls, such as a gauge, dial, status indicator, and
     tumbler, are provided by the \l {Qt Quick Extras} module.
 
-    The \QC project wizards create Qt Quick applications that use Qt Quick
-    Components or Controls.
-
-    Even if you use the Qt Quick Components, you can still write cross-platform
-    applications, by using different sets of QML files for each platform.
-
     \section1 Creating Components in Qt Quick Designer
 
     \list 1

doc/src/qtquick/qtquick-modules-with-plugins.qdoc

@@ -135,5 +135,6 @@
     application for example to mockup C++ items, then you can use \c{QML_DESIGNER_IMPORT_PATH}
     in the \c{.pro} file.
     Modules in the import paths defined in \c{QML_DESIGNER_IMPORT_PATH} will be used only in \QMLD.
+    For an example, see \l {Qt Quick Controls 2 - Contact List}.
 
 */

doc/src/qtquick/qtquick-screens.qdoc

@@ -45,19 +45,6 @@
     The QML files in the project folder are displayed in \uicontrol {QML Components}
     in the \uicontrol Library.
 
-    You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
-    screens with a native look and feel for a particular target platform.
-    Since Qt 5.1, Qt Quick Controls, Dialogs, and Layouts are available for
-    creating classic desktop-style user interfaces using Qt Quick 2.1. You can
-    use the Qt Quick Controls Styles to customize Qt Quick Controls.
-
-    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
-    Qt Labs Controls. These controls provide lightweight QML types for creating
-    performant user interfaces for embedded and mobile devices. These controls
-    achieve improved efficiency by employing a simplified styling architecture
-    when compared to Qt Quick Controls, on which the module is based. These
-    types work in conjunction with Qt Quick and Qt Quick Layouts.
-
     \section1 Adding Components to Screens
 
     \list 1
@@ -72,6 +59,8 @@
 
     \endlist
 
+    For more information about the ready-made components available, see
+    \l {Using Qt Quick Controls}.
 
     \section1 Using Data Models
 
@@ -338,7 +327,7 @@
     example, you can use states to create two screens.
 
     To add states, click the empty slot in the \uicontrol States pane. Then modify the
-    new state in the \uicontrol {Form Editor}.
+    new state in the \uicontrol {Form Editor} or the \uicontrol Properties pane.
 
     \image qmldesigner-states.png "States pane"
 
@@ -402,6 +391,18 @@
 
         \endlist
 
+    \section2 Using SCXML State Machines
+
+    To use QML and \QMLD together with an SCXML state machine, add states and
+    bind them to the state machine in the \uicontrol Backends tab, as described
+    in \l {Managing C++ Backend Objects}.
+
+    In the \uicontrol States pane, you can edit the \c when condition of states
+    to map QML states to the states of the SCXML state machine. For an example,
+    see \l {Qt SCXML Traffic Light QML Example (Dynamic)}.
+
+    \image qmldesigner-states-when-condition.png
+
     \section1 Animating Screens
 
     To make movement between states smooth, you can specify transitions. You can

share/qtcreator/debugger/dumper.py

@@ -1320,9 +1320,10 @@ class DumperBase:
         derefValue.name = '*'
         self.putItem(derefValue)
         self.currentChildType = savedCurrentChildType
-        self.putOriginalAddress(value.pointer())
+        self.putAddress(value.address())
 
     def putFormattedPointerX(self, value):
+        self.putOriginalAddress(value.address())
         #warn("PUT FORMATTED: %s" % value)
         pointer = value.pointer()
         #warn('POINTER: 0x%x' % pointer)
@@ -2671,7 +2672,6 @@ class DumperBase:
         typeName = typeobj.name
 
         self.addToCache(typeobj) # Fill type cache
-        self.putAddress(value.address())
 
         if not value.lIsInScope:
             self.putSpecialValue('optimizedout')
@@ -2685,6 +2685,10 @@ class DumperBase:
 
         # Try on possibly typedefed type first.
         if self.tryPutPrettyItem(typeName, value):
+            if typeobj.code == TypeCodePointer:
+                self.putOriginalAddress(value.address())
+            else:
+                self.putAddress(value.address())
             return
 
         if typeobj.code == TypeCodeTypedef:
@@ -2697,6 +2701,8 @@ class DumperBase:
             self.putFormattedPointer(value)
             return
 
+        self.putAddress(value.address())
+
         if typeobj.code == TypeCodeFunction:
             #warn('FUNCTION VALUE: %s' % value)
             self.putType(typeobj)
@@ -3142,7 +3148,7 @@ class DumperBase:
             if self.dumper.isInt(other):
                 stripped = self.type.stripTypedefs()
                 if stripped.code == TypeCodePointer:
-                    address = self.pointer() + stripped.dereference().size()
+                    address = self.pointer() + stripped.dereference().size() * other
                     val = self.dumper.Value(self.dumper)
                     val.laddress = None
                     val.ldata = bytes(struct.pack(self.dumper.packCode + 'Q', address))

share/qtcreator/debugger/misctypes.py

@@ -349,3 +349,16 @@ def qdump__QtcDumperTest_PointerArray(d, value):
             for i in d.childRange():
                 d.putSubItem(i, foos[i])
 
+def qdump__QtcDumperTest_BufArray(d, value):
+    maxItems = 1000
+    buffer = value['buffer']
+    count = int(value['count'])
+    objsize = int(value['objSize'])
+    valueType = value.type.templateArgument(0)
+    d.putItemCount(count, maxItems)
+    d.putNumChild(count)
+    if d.isExpanded():
+        with Children(d, count, maxNumChild=maxItems, childType=valueType):
+            for i in d.childRange():
+                d.putSubItem(i, (buffer + (i * objsize)).dereference().cast(valueType))
+

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.cpp

@@ -45,4 +45,9 @@ void DummyContextObject::setParentDummy(QObject *parentDummy)
     }
 }
 
+bool DummyContextObject::runningInDesigner() const
+{
+    return true;
+}
+
 } // namespace QmlDesigner

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h

@@ -35,12 +35,14 @@ class DummyContextObject : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QObject * parent READ parentDummy WRITE setParentDummy NOTIFY parentDummyChanged DESIGNABLE false FINAL)
+    Q_PROPERTY(bool runningInDesigner READ runningInDesigner FINAL)
 
 public:
     explicit DummyContextObject(QObject *parent = 0);
 
     QObject *parentDummy() const;
     void setParentDummy(QObject *parentDummy);
+    bool runningInDesigner() const;
 
 signals:
     void parentDummyChanged();

src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

@@ -259,7 +259,7 @@ static inline void splitCommand(PCSTR args, Inserter it)
 template<class StringContainer>
 static inline StringContainer commandTokens(PCSTR args, int *token = 0)
 {
-    typedef StringContainer::iterator ContainerIterator;
+    typedef typename StringContainer::iterator ContainerIterator;
 
     if (token)
         *token = -1; // Handled as 'display' in engine, so that user can type commands

src/libs/ssh/sshchannel.cpp

@@ -75,7 +75,7 @@ void AbstractSshChannel::requestSessionStart()
         m_sendFacility.sendSessionPacket(m_localChannel, initialWindowSize(), maxPacketSize());
         setChannelState(SessionRequested);
         m_timeoutTimer.start(ReplyTimeout);
-    }  catch (const Botan::Exception &e) {
+    }  catch (const std::exception &e) {
         qCWarning(sshLog, "Botan error: %s", e.what());
         closeChannel();
     }
@@ -86,7 +86,7 @@ void AbstractSshChannel::sendData(const QByteArray &data)
     try {
         m_sendBuffer += data;
         flushSendBuffer();
-    }  catch (const Botan::Exception &e) {
+    }  catch (const std::exception &e) {
         qCWarning(sshLog, "Botan error: %s", e.what());
         closeChannel();
     }

src/libs/ssh/sshchannelmanager.cpp

@@ -91,7 +91,7 @@ void SshChannelManager::handleChannelOpen(const SshIncomingPacket &packet)
         try {
             m_sendFacility.sendChannelOpenFailurePacket(channelOpen.remoteChannel, reason,
                                                         QByteArray());
-        }  catch (const Botan::Exception &e) {
+        }  catch (const std::exception &e) {
             qCWarning(sshLog, "Botan error: %s", e.what());
         }
         return;

src/libs/ssh/sshconnection.cpp

@@ -200,7 +200,7 @@ int SshConnection::closeAllChannels()
 {
     try {
         return d->m_channelManager->closeAllChannels(Internal::SshChannelManager::CloseAllRegular);
-    } catch (const Botan::Exception &e) {
+    } catch (const std::exception &e) {
         qCWarning(Internal::sshLog, "%s: %s", Q_FUNC_INFO, e.what());
         return -1;
     }
@@ -346,7 +346,7 @@ void SshConnectionPrivate::handleIncomingData()
     } catch (const SshClientException &e) {
         closeConnection(SSH_DISCONNECT_BY_APPLICATION, e.error, "",
             e.errorString);
-    } catch (const Botan::Exception &e) {
+    } catch (const std::exception &e) {
         closeConnection(SSH_DISCONNECT_BY_APPLICATION, SshInternalError, "",
             tr("Botan library exception: %1").arg(QString::fromLatin1(e.what())));
     }

src/libs/ssh/sshcryptofacility.cpp

@@ -272,10 +272,7 @@ bool SshEncryptionFacility::createAuthenticationKeyFromPKCS8(const QByteArray &p
                       Q_FUNC_INFO);
             return false;
         }
-    } catch (const Exception &ex) {
-        error = QLatin1String(ex.what());
-        return false;
-    } catch (const Decoding_Error &ex) {
+    } catch (const std::exception &ex) {
         error = QLatin1String(ex.what());
         return false;
     }
@@ -360,10 +357,7 @@ bool SshEncryptionFacility::createAuthenticationKeyFromOpenSSL(const QByteArray
 
         sequence.discard_remaining();
         sequence.verify_end();
-    } catch (const Exception &ex) {
-        error = QLatin1String(ex.what());
-        return false;
-    } catch (const Decoding_Error &ex) {
+    } catch (const std::exception &ex) {
         error = QLatin1String(ex.what());
         return false;
     }

src/libs/ssh/sshdirecttcpiptunnel.cpp

@@ -103,7 +103,7 @@ void SshDirectTcpIpTunnel::initialize()
             d->m_originatingHost.toUtf8(), d->m_originatingPort);
         d->setChannelState(AbstractSshChannel::SessionRequested);
         d->m_timeoutTimer.start(d->ReplyTimeout);
-    }  catch (const Botan::Exception &e) { // Won't happen, but let's play it safe.
+    }  catch (const std::exception &e) { // Won't happen, but let's play it safe.
         qCWarning(sshLog, "Botan error: %s", e.what());
         d->closeChannel();
     }

src/libs/ssh/sshforwardedtcpiptunnel.cpp

@@ -45,7 +45,7 @@ void SshForwardedTcpIpTunnelPrivate::handleOpenSuccessInternal()
     try {
         m_sendFacility.sendChannelOpenConfirmationPacket(remoteChannel(), localChannelId(),
                                                          initialWindowSize(), maxPacketSize());
-    } catch (const Botan::Exception &e) { // Won't happen, but let's play it safe.
+    } catch (const std::exception &e) { // Won't happen, but let's play it safe.
         qCWarning(sshLog, "Botan error: %s", e.what());
         closeChannel();
     }

src/libs/ssh/sshkeycreationdialog.cpp

@@ -77,6 +77,8 @@ void SshKeyCreationDialog::keyTypeChanged()
         keySizes << QLatin1String("1024") << QLatin1String("2048") << QLatin1String("4096");
     else if (m_ui->ecdsa->isChecked())
         keySizes << QLatin1String("256") << QLatin1String("384") << QLatin1String("521");
+    else if (m_ui->dsa->isChecked())
+        keySizes << QLatin1String("1024");
     m_ui->comboBox->addItems(keySizes);
     if (!keySizes.isEmpty())
         m_ui->comboBox->setCurrentIndex(0);

src/libs/ssh/sshkeygenerator.cpp

@@ -83,7 +83,7 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke
             generateOpenSslPublicKeyString(key);
         }
         return true;
-    } catch (const Exception &e) {
+    } catch (const std::exception &e) {
         m_error = tr("Error generating key: %1").arg(QString::fromLatin1(e.what()));
         return false;
     }

src/libs/ssh/sshremoteprocess.cpp

@@ -209,7 +209,7 @@ void SshRemoteProcess::sendSignal(Signal signal)
             QSSH_ASSERT_AND_RETURN(signalString);
             d->m_sendFacility.sendChannelSignalPacket(d->remoteChannel(), signalString);
         }
-    }  catch (const Botan::Exception &e) {
+    }  catch (const std::exception &e) {
         setErrorString(QString::fromLatin1(e.what()));
         d->closeChannel();
     }

src/libs/ssh/sshtcpipforwardserver.cpp

@@ -86,7 +86,7 @@ void SshTcpIpForwardServer::initialize()
             emit stateChanged(Initializing);
             d->m_sendFacility.sendTcpIpForwardPacket(d->m_bindAddress.toUtf8(), d->m_bindPort);
             d->m_timeoutTimer.start(d->ReplyTimeout);
-        } catch (const Botan::Exception &e) {
+        } catch (const std::exception &e) {
             qCWarning(sshLog, "Botan error: %s", e.what());
             d->m_timeoutTimer.stop();
             setClosed();
@@ -105,7 +105,7 @@ void SshTcpIpForwardServer::close()
             d->m_sendFacility.sendCancelTcpIpForwardPacket(d->m_bindAddress.toUtf8(),
                                                            d->m_bindPort);
             d->m_timeoutTimer.start(d->ReplyTimeout);
-        } catch (const Botan::Exception &e) {
+        } catch (const std::exception &e) {
             qCWarning(sshLog, "Botan error: %s", e.what());
             d->m_timeoutTimer.stop();
             setClosed();

src/plugins/android/androidconfigurations.cpp

@@ -61,7 +61,9 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QHostAddress>
+#include <QLoggingCategory>
 #include <QProcess>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QStringList>
 #include <QTcpSocket>
@@ -72,6 +74,10 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
+namespace {
+Q_LOGGING_CATEGORY(avdConfigLog, "qtc.android.androidconfig")
+}
+
 namespace Android {
 using namespace Internal;
 
@@ -114,6 +120,7 @@ namespace {
     const QLatin1String changeTimeStamp("ChangeTimeStamp");
 
     const QLatin1String sdkToolsVersionKey("Pkg.Revision");
+    const QLatin1String ndkRevisionKey("Pkg.Revision");
 
     static QString sdkSettingsFileName()
     {
@@ -758,6 +765,53 @@ FileName AndroidConfig::ndkLocation() const
     return m_ndkLocation;
 }
 
+QVersionNumber AndroidConfig::ndkVersion() const
+{
+    QVersionNumber version;
+    if (!m_ndkLocation.exists()) {
+        qCDebug(avdConfigLog) << "Can not find ndk version. Check NDK path."
+                              << m_ndkLocation.toString();
+        return version;
+    }
+
+    Utils::FileName ndkPropertiesPath(m_ndkLocation);
+    ndkPropertiesPath.appendPath("source.properties");
+    if (ndkPropertiesPath.exists()) {
+        // source.properties files exists in NDK version > 11
+        QSettings settings(ndkPropertiesPath.toString(), QSettings::IniFormat);
+        auto versionStr = settings.value(ndkRevisionKey).toString();
+        version = QVersionNumber::fromString(versionStr);
+    } else {
+        // No source.properties. There should be a file named RELEASE.TXT
+        Utils::FileName ndkReleaseTxtPath(m_ndkLocation);
+        ndkReleaseTxtPath.appendPath("RELEASE.TXT");
+        Utils::FileReader reader;
+        QString errorString;
+        if (reader.fetch(ndkReleaseTxtPath.toString(), &errorString)) {
+            // RELEASE.TXT contains the ndk version in either of the following formats:
+            // r6a
+            // r10e (64 bit)
+            QString content = QString::fromUtf8(reader.data());
+            QRegularExpression re("(r)(?<major>[0-9]{1,2})(?<minor>[a-z]{1,1})");
+            QRegularExpressionMatch match = re.match(content);
+            if (match.hasMatch()) {
+                QString major = match.captured("major");
+                QString minor = match.captured("minor");
+                // Minor version: a = 0, b = 1, c = 2 and so on.
+                // Int equivalent = minorVersionChar - 'a'. i.e. minorVersionChar - 97.
+                version = QVersionNumber::fromString(QString("%1.%2.0").arg(major)
+                                                     .arg((int)minor[0].toLatin1() - 97));
+            } else {
+                qCDebug(avdConfigLog) << "Can not find ndk version. Can not parse RELEASE.TXT."
+                                      << content;
+            }
+        } else {
+            qCDebug(avdConfigLog) << "Can not find ndk version." << errorString;
+        }
+    }
+    return version;
+}
+
 void AndroidConfig::setNdkLocation(const FileName &ndkLocation)
 {
     m_ndkLocation = ndkLocation;

src/plugins/android/androidconfigurations.h

@@ -115,6 +115,7 @@ public:
     QVersionNumber sdkToolsVersion() const;
 
     Utils::FileName ndkLocation() const;
+    QVersionNumber ndkVersion() const;
     void setNdkLocation(const Utils::FileName &ndkLocation);
 
     Utils::FileName antLocation() const;

src/plugins/android/androiddebugsupport.cpp

@@ -104,8 +104,10 @@ RunControl *AndroidDebugSupport::createDebugRunControl(RunConfiguration *runConf
     params.displayName = AndroidManager::packageName(target);
     params.remoteSetupNeeded = true;
     params.useContinueInsteadOfRun = true;
-    if (!Utils::HostOsInfo::isWindowsHost()) // Workaround for NDK 11c(b?)
+    if (!Utils::HostOsInfo::isWindowsHost() &&
+            AndroidConfigurations::currentConfig().ndkVersion() >= QVersionNumber(11, 0, 0)) {
         params.useTargetAsync = true;
+    }
 
     auto aspect = runConfig->extraAspect<DebuggerRunConfigurationAspect>();
 

src/plugins/android/androidtoolmanager.cpp

@@ -161,7 +161,7 @@ AndroidConfig::CreateAvdInfo AndroidToolManager::createAvdImpl(AndroidConfig::Cr
     proc.setProcessEnvironment(env.toProcessEnvironment());
     QStringList arguments;
     arguments << QLatin1String("create") << QLatin1String("avd")
-              << QLatin1String("-t") << info.target.name
+              << QLatin1String("-t") << AndroidConfig::apiLevelNameFor(info.target)
               << QLatin1String("-n") << info.name
               << QLatin1String("-b") << info.abi;
     if (info.sdcardSize > 0)

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -531,8 +531,8 @@ void CMakeProject::createGeneratedCodeModelSupport()
             = Utils::transform<QSet>(factories, [](const ExtraCompilerFactory *f) { return f->sourceTag(); });
 
     // Find all files generated by any of the extra compilers, in a rather crude way.
-    const QStringList fileList = files(SourceFiles, [&fileExtensions](const FileNode *fn) {
-        const QString fp = fn->filePath().toString();
+    const QStringList fileList = files(SourceFiles, [&fileExtensions](const Node *n) {
+        const QString fp = n->filePath().toString();
         const int pos = fp.lastIndexOf('.');
         return pos >= 0 && fileExtensions.contains(fp.mid(pos + 1));
     });

src/plugins/cmakeprojectmanager/servermodereader.cpp

@@ -735,7 +735,7 @@ void ServerModeReader::addHeaderNodes(ProjectNode *root, const QList<FileNode *>
         const int count = seenHeaders.count();
         seenHeaders.insert(fn->filePath());
         if (seenHeaders.count() != count) {
-            auto node = new FileNode(*fn);
+            auto node = fn->clone();
             node->setEnabled(false);
             headerNode->addNestedNode(node);
         }

src/plugins/cmakeprojectmanager/tealeafreader.cpp

@@ -309,7 +309,7 @@ void TeaLeafReader::generateProjectTree(CMakeProjectNode *root, const QList<cons
         return Utils::contains(allIncludePaths, [fn](const FileName &inc) { return fn->filePath().isChildOf(inc); });
     });
 
-    QList<FileNode *> fileNodes = m_files + Utils::transform(missingHeaders, [](const FileNode *fn) { return new FileNode(*fn); });
+    QList<FileNode *> fileNodes = m_files + Utils::transform(missingHeaders, [](const FileNode *fn) { return fn->clone(); });
 
     root->addNestedNodes(fileNodes, m_parameters.sourceDirectory);
     m_files.clear(); // Some of the FileNodes in files() were deleted!

src/plugins/coreplugin/helpmanager.cpp

@@ -380,8 +380,6 @@ void HelpManager::setupHelpManager()
 
     // create the help engine
     d->m_helpEngine = new QHelpEngineCore(collectionFilePath(), m_instance);
-    d->m_helpEngine->setAutoSaveFilter(false);
-    d->m_helpEngine->setCurrentFilter(tr("Unfiltered"));
     d->m_helpEngine->setupData();
 
     foreach (const QString &filePath, d->documentationFromInstaller())

src/plugins/debugger/cdb/cdbengine.cpp

@@ -521,6 +521,10 @@ bool CdbEngine::launchCDB(const DebuggerRunParameters &sp, QString *errorMessage
     const QFileInfo extensionFi(CdbEngine::extensionLibraryName(cdbIs64Bit));
     if (!extensionFi.isFile()) {
         *errorMessage = tr("Internal error: The extension %1 cannot be found.\n"
+                           "If you have updated Qt Creator via Maintenance Tool you may "
+                           "need to rerun the Tool and select \"Add or remove components\""
+                           "and then select the\n"
+                           "Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component.\n"
                            "If you build Qt Creator from sources and want to use a cdb executable"
                            "with another bitness than your Qt Creator build,\n"
                            "you will need to build a separate cdbextension with the "

src/plugins/git/gerrit/gerritmodel.cpp

@@ -799,6 +799,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
     } else {
         adaptedOutput = output;
         // Strip first line, which is )]}'
+        if (adaptedOutput.startsWith(')'))
             adaptedOutput.remove(0, adaptedOutput.indexOf("\n"));
     }
     bool res = true;

src/plugins/help/localhelpmanager.cpp

@@ -304,10 +304,8 @@ QHelpEngine &LocalHelpManager::helpEngine()
 {
     if (!m_guiEngine) {
         QMutexLocker _(&m_guiMutex);
-        if (!m_guiEngine) {
+        if (!m_guiEngine)
             m_guiEngine = new QHelpEngine(QString());
-            m_guiEngine->setAutoSaveFilter(false);
-        }
     }
     return *m_guiEngine;
 }

src/plugins/nim/project/nimproject.cpp

@@ -168,8 +168,8 @@ bool NimProject::supportsKit(Kit *k, QString *errorMessage) const
 
 FileNameList NimProject::nimFiles() const
 {
-    const QStringList nim = files(AllFiles, [](const ProjectExplorer::FileNode *fn) {
-        return fn->filePath().endsWith(".nim");
+    const QStringList nim = files(AllFiles, [](const ProjectExplorer::Node *n) {
+        return n->filePath().endsWith(".nim");
     });
     return Utils::transform(nim, [](const QString &fp) { return Utils::FileName::fromString(fp); });
 }

src/plugins/projectexplorer/abi.cpp

@@ -606,24 +606,36 @@ bool Abi::operator == (const Abi &other) const
 
 bool Abi::isCompatibleWith(const Abi &other) const
 {
-    bool isCompat = (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
-                     && (os() == other.os() || other.os() == Abi::UnknownOS)
-                     && (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor)
-                     && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
+    // Generic match: If stuff is identical or the other side is unknown, then this is a match.
+    bool isCompat = (architecture() == other.architecture() || other.architecture() == UnknownArchitecture)
+                     && (os() == other.os() || other.os() == UnknownOS)
+                     && (osFlavor() == other.osFlavor() || other.osFlavor() == UnknownFlavor)
+                     && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == UnknownFormat)
                      && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
+
     // *-linux-generic-* is compatible with *-linux-* (both ways): This is for the benefit of
     // people building Qt themselves using e.g. a meego toolchain.
     //
-    // We leave it to the specific targets to catch filter out the tool chains that do not
+    // We leave it to the specific targets to filter out the tool chains that do not
     // work for them.
-    if (!isCompat && (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
+    if (!isCompat && (architecture() == other.architecture() || other.architecture() == UnknownArchitecture)
                   && ((os() == other.os()) && (os() == LinuxOS))
                   && (osFlavor() == GenericLinuxFlavor || other.osFlavor() == GenericLinuxFlavor)
-                  && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
-                  && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0))
+                  && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == UnknownFormat)
+                  && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0)) {
         isCompat = true;
-    if (osFlavor() == AndroidLinuxFlavor || other.osFlavor() == AndroidLinuxFlavor)
-        isCompat = (osFlavor() == other.osFlavor() && architecture() == other.architecture());
+    }
+
+    // Make Android matching more strict than the generic Linux matches so far:
+    if (isCompat && (osFlavor() == AndroidLinuxFlavor || other.osFlavor() == AndroidLinuxFlavor))
+        isCompat = (architecture() == other.architecture()) &&  (osFlavor() == other.osFlavor());
+
+    // MSVC2017 is compatible with MSVC2015
+    if (!isCompat
+            && ((osFlavor() == WindowsMsvc2015Flavor && other.osFlavor() == WindowsMsvc2017Flavor)
+                || (osFlavor() == WindowsMsvc2017Flavor && other.osFlavor() == WindowsMsvc2015Flavor))) {
+        isCompat = true;
+    }
     return isCompat;
 }
 

src/plugins/projectexplorer/appoutputpane.cpp

@@ -418,6 +418,10 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
         delete tab.runControl;
         handleOldOutput(tab.window);
         tab.runControl = rc;
+
+        // Update the title.
+        m_tabWidget->setTabText(tabIndex, rc->displayName());
+
         tab.window->setFormatter(nullptr);
         tab.window->scrollToBottom();
         if (debug)

src/plugins/projectexplorer/project.cpp

@@ -548,7 +548,7 @@ Project::RestoreResult Project::restoreSettings(QString *errorMessage)
 }
 
 QStringList Project::files(Project::FilesMode fileMode,
-                           const std::function<bool (const FileNode *)> &filter) const
+                           const std::function<bool(const Node *)> &filter) const
 {
     QStringList result;
 
@@ -556,17 +556,19 @@ QStringList Project::files(Project::FilesMode fileMode,
         return result;
 
     QSet<QString> alreadySeen;
-    rootProjectNode()->forEachNode([&](const FileNode *fn) {
-        if (filter && !filter(fn))
-            return;
-        const QString path = fn->filePath().toString();
+    rootProjectNode()->forEachGenericNode([&](const Node *n) {
+        const QString path = n->filePath().toString();
         const int count = alreadySeen.count();
         alreadySeen.insert(path);
         if (count == alreadySeen.count())
             return; // skip duplicates
+        if (!n->listInProject())
+            return;
+        if (filter && !filter(n))
+            return;
         if ((fileMode == AllFiles)
-                || (fileMode == SourceFiles && !fn->isGenerated())
-                || (fileMode == GeneratedFiles && fn->isGenerated()))
+                || (fileMode == SourceFiles && !n->isGenerated())
+                || (fileMode == GeneratedFiles && n->isGenerated()))
             result.append(path);
     });
     return result;

src/plugins/projectexplorer/project.h

@@ -47,8 +47,8 @@ namespace ProjectExplorer {
 class BuildInfo;
 class ContainerNode;
 class EditorConfiguration;
-class FileNode;
 class NamedWidget;
+class Node;
 class ProjectImporter;
 class ProjectNode;
 class ProjectPrivate;
@@ -133,7 +133,7 @@ public:
         AllFiles       = SourceFiles | GeneratedFiles
     };
     QStringList files(FilesMode fileMode,
-                      const std::function<bool(const FileNode *)> &filter = {}) const;
+                      const std::function<bool(const Node *)> &filter = {}) const;
     virtual QStringList filesGeneratedFrom(const QString &sourceFile) const;
 
     static QString makeUnique(const QString &preferredName, const QStringList &usedNames);

src/plugins/projectexplorer/projectnodes.cpp

@@ -127,6 +127,22 @@ void Node::setPriority(int p)
     m_priority = p;
 }
 
+void Node::setListInProject(bool l)
+{
+    if (l)
+        m_flags |= FlagListInProject;
+    else
+        m_flags &= ~FlagListInProject;
+}
+
+void Node::setIsGenerated(bool g)
+{
+    if (g)
+        m_flags |= FlagIsGenerated;
+    else
+        m_flags &= ~FlagIsGenerated;
+}
+
 void Node::setAbsoluteFilePathAndLine(const Utils::FileName &path, int line)
 {
     if (m_filePath == path && m_line == line)
@@ -148,6 +164,14 @@ int Node::priority() const
     return m_priority;
 }
 
+/*!
+  Returns \c true if the Node should be listed as part of the projects file list.
+  */
+bool Node::listInProject() const
+{
+    return m_flags.testFlag(FlagListInProject);
+}
+
 /*!
   The project that owns and manages the node. It is the first project in the list
   of ancestors.
@@ -209,12 +233,20 @@ QString Node::tooltip() const
 
 bool Node::isEnabled() const
 {
-    if (!m_isEnabled)
+    if (!m_flags.testFlag(FlagIsEnabled))
         return false;
     FolderNode *parent = parentFolderNode();
     return parent ? parent->isEnabled() : true;
 }
 
+/*!
+  Returns \c true if the file is automatically generated by a compile step.
+  */
+bool Node::isGenerated() const
+{
+    return (m_flags & FlagIsGenerated) == FlagIsGenerated;
+}
+
 bool Node::supportsAction(ProjectAction, Node *) const
 {
     return false;
@@ -222,9 +254,10 @@ bool Node::supportsAction(ProjectAction, Node *) const
 
 void Node::setEnabled(bool enabled)
 {
-    if (m_isEnabled == enabled)
-        return;
-    m_isEnabled = enabled;
+    if (enabled)
+        m_flags |= FlagIsEnabled;
+    else
+        m_flags &= ~FlagIsEnabled;
 }
 
 bool Node::sortByPath(const Node *a, const Node *b)
@@ -278,28 +311,30 @@ FileType Node::fileTypeForFileName(const Utils::FileName &file)
 FileNode::FileNode(const Utils::FileName &filePath,
                    const FileType fileType,
                    bool generated, int line) : Node(NodeType::File, filePath, line),
-    m_fileType(fileType),
-    m_generated(generated)
+    m_fileType(fileType)
 {
+    setListInProject(true);
+    setIsGenerated(generated);
     if (fileType == FileType::Project)
         setPriority(DefaultProjectFilePriority);
     else
         setPriority(DefaultFilePriority);
 }
 
+FileNode *FileNode::clone() const
+{
+    auto fn = new FileNode(filePath(), fileType(), isGenerated(), line());
+    fn->setEnabled(isEnabled());
+    fn->setPriority(priority());
+    fn->setListInProject(listInProject());
+    return fn;
+}
+
 FileType FileNode::fileType() const
 {
     return m_fileType;
 }
 
-/*!
-  Returns \c true if the file is automatically generated by a compile step.
-  */
-bool FileNode::isGenerated() const
-{
-    return m_generated;
-}
-
 static QList<FileNode *> scanForFilesRecursively(const Utils::FileName &directory,
                                                  const std::function<FileNode *(const Utils::FileName &)> factory,
                                                  QSet<QString> &visited, QFutureInterface<QList<FileNode*>> *future,
@@ -379,6 +414,8 @@ FolderNode::FolderNode(const Utils::FileName &folderPath, NodeType nodeType, con
     m_displayName(displayName)
 {
     setPriority(DefaultFolderPriority);
+    setListInProject(false);
+    setIsGenerated(false);
     if (m_displayName.isEmpty())
         m_displayName = folderPath.toUserOutput();
 }
@@ -470,7 +507,7 @@ void FolderNode::forEachGenericNode(const std::function<void(Node *)> &genericTa
     for (Node *n : m_nodes) {
         genericTask(n);
         if (FolderNode *fn = n->asFolderNode())
-            fn->forEachNode(genericTask);
+            fn->forEachGenericNode(genericTask);
     }
 }
 
@@ -593,7 +630,8 @@ void FolderNode::setIcon(const QIcon &icon)
 
 QString FolderNode::addFileFilter() const
 {
-    return parentFolderNode()->addFileFilter();
+    FolderNode *fn = parentFolderNode();
+    return fn ? fn->addFileFilter() : QString();
 }
 
 bool FolderNode::supportsAction(ProjectAction action, Node *node) const
@@ -718,6 +756,7 @@ ProjectNode::ProjectNode(const Utils::FileName &projectFilePath) :
     FolderNode(projectFilePath, NodeType::Project)
 {
     setPriority(DefaultProjectPriority);
+    setListInProject(true);
     setDisplayName(projectFilePath.fileName());
 }
 

src/plugins/projectexplorer/projectnodes.h

@@ -129,6 +129,8 @@ public:
     virtual QString displayName() const;
     virtual QString tooltip() const;
     bool isEnabled() const;
+    bool listInProject() const;
+    bool isGenerated() const;
 
     virtual bool supportsAction(ProjectAction action, Node *node) const;
 
@@ -147,6 +149,8 @@ public:
     static bool sortByPath(const Node *a, const Node *b);
     void setParentFolderNode(FolderNode *parentFolder);
 
+    void setListInProject(bool l);
+
     static FileType fileTypeForMimeType(const Utils::MimeType &mt);
     static FileType fileTypeForFileName(const Utils::FileName &file);
 
@@ -154,6 +158,7 @@ protected:
     Node(NodeType nodeType, const Utils::FileName &filePath, int line = -1);
 
     void setPriority(int priority);
+    void setIsGenerated(bool g);
 
 private:
     FolderNode *m_parentFolderNode = nullptr;
@@ -161,17 +166,24 @@ private:
     int m_line = -1;
     int m_priority = DefaultPriority;
     const NodeType m_nodeType;
-    bool m_isEnabled = true;
+    enum NodeFlag : quint16 {
+        FlagNone = 0,
+        FlagIsEnabled = 1 << 0,
+        FlagIsGenerated = 1 << 1,
+        FlagListInProject = 1 << 2,
+    };
+    using NodeFlags = QFlags<NodeFlag>;
+    NodeFlags m_flags = FlagIsEnabled;
 };
 
 class PROJECTEXPLORER_EXPORT FileNode : public Node
 {
 public:
     FileNode(const Utils::FileName &filePath, const FileType fileType, bool generated, int line = -1);
-    FileNode(const FileNode &other) : FileNode(other.filePath(), other.fileType(), true) {}
+
+    FileNode *clone() const;
 
     FileType fileType() const;
-    bool isGenerated() const;
 
     FileNode *asFileNode() final { return this; }
     const FileNode *asFileNode() const final { return this; }
@@ -183,7 +195,6 @@ public:
 
 private:
     FileType m_fileType;
-    bool m_generated;
 };
 
 // Documentation inside.

src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp

@@ -59,9 +59,23 @@ void setupArtifacts(ProjectExplorer::FolderNode *root, const QList<qbs::Artifact
         const Utils::FileName path = Utils::FileName::fromString(ad.filePath());
         const ProjectExplorer::FileType type = fileType(ad);
         const bool isGenerated = ad.isGenerated();
-        root->addNestedNode(new ProjectExplorer::FileNode(path, type, isGenerated));
-    };
 
+        // A list of human-readable file types that we can reasonably expect
+        // to get generated during a build. Extend as needed.
+        static const QSet<QString> sourceTags = {
+            QLatin1String("c"), QLatin1String("cpp"), QLatin1String("hpp"),
+            QLatin1String("objc"), QLatin1String("objcpp"),
+            QLatin1String("c_pch_src"), QLatin1String("cpp_pch_src"),
+            QLatin1String("objc_pch_src"), QLatin1String("objcpp_pch_src"),
+            QLatin1String("asm"), QLatin1String("asm_cpp"),
+            QLatin1String("linkerscript"),
+            QLatin1String("qrc"), QLatin1String("java.java")
+        };
+        ProjectExplorer::FileNode * const node
+                = new ProjectExplorer::FileNode(path, type, isGenerated);
+        node->setListInProject(!isGenerated || ad.fileTags().toSet().intersects(sourceTags));
+        root->addNestedNode(node);
+    }
     root->compress();
 }
 

src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp

@@ -29,6 +29,9 @@
 
 #include <coreplugin/fileiconprovider.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/target.h>
+#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtkitinformation.h>
 #include <resourceeditor/resourcenode.h>
 
 #include <utils/algorithm.h>
@@ -39,6 +42,7 @@
 
 using namespace Core;
 using namespace ProjectExplorer;
+using namespace QtSupport;
 using namespace Utils;
 
 namespace {
@@ -135,7 +139,7 @@ void clearQmakeStaticData()
 
 namespace QmakeProjectManager {
 
-static void createTree(const QmakePriFile *pri, QmakePriFileNode *node)
+static void createTree(const QmakePriFile *pri, QmakePriFileNode *node, const FileNameList &toExclude)
 {
     QTC_ASSERT(pri, return);
     QTC_ASSERT(node, return);
@@ -150,7 +154,9 @@ static void createTree(const QmakePriFile *pri, QmakePriFileNode *node)
     const QVector<QmakeStaticData::FileTypeData> &fileTypes = qmakeStaticData()->fileTypeData;
     for (int i = 0; i < fileTypes.size(); ++i) {
         FileType type = fileTypes.at(i).type;
-        const QSet<FileName> &newFilePaths = pri->files(type);
+        const QSet<FileName> &newFilePaths = Utils::filtered(pri->files(type), [&toExclude](const Utils::FileName &fn) {
+            return !Utils::contains(toExclude, [&fn](const Utils::FileName &ex) { return fn.isChildOf(ex); });
+        });
 
         if (!newFilePaths.isEmpty()) {
             auto vfolder = new VirtualFolderNode(pri->filePath().parentDir(), Node::DefaultVirtualFolderPriority - i);
@@ -162,13 +168,14 @@ static void createTree(const QmakePriFile *pri, QmakePriFileNode *node)
                 for (const FileName &file : newFilePaths) {
                     auto vfs = pri->project()->qmakeVfs();
                     QString contents;
+                    QString errorMessage;
                     // Prefer the cumulative file if it's non-empty, based on the assumption
                     // that it contains more "stuff".
-                    vfs->readVirtualFile(file.toString(), QMakeVfs::VfsCumulative, &contents);
+                    vfs->readFile(file.toString(), QMakeVfs::VfsCumulative, &contents, &errorMessage);
                     // If the cumulative evaluation botched the file too much, try the exact one.
                     if (contents.isEmpty())
-                        vfs->readVirtualFile(file.toString(), QMakeVfs::VfsExact, &contents);
-                    auto resourceNode = new ResourceEditor::ResourceTopLevelNode(file, contents, vfolder);
+                        vfs->readFile(file.toString(), QMakeVfs::VfsExact, &contents, &errorMessage);
+                    auto resourceNode = new ResourceEditor::ResourceTopLevelNode(file, false, contents, vfolder);
                     vfolder->addNode(resourceNode);
                 }
             } else {
@@ -188,15 +195,22 @@ static void createTree(const QmakePriFile *pri, QmakePriFileNode *node)
             newNode = new QmakeProFileNode(c->project(), c->filePath());
         else
             newNode = new QmakePriFileNode(c->project(), node->proFileNode(), c->filePath());
-        createTree(c, newNode);
+        createTree(c, newNode, toExclude);
         node->addNode(newNode);
     }
 }
 
 QmakeProFileNode *QmakeNodeTreeBuilder::buildTree(QmakeProject *project)
 {
+    // Remove qmake implementation details that litter up the project data:
+    Target *t = project->activeTarget();
+    Kit *k = t ? t->kit() : nullptr;
+    BaseQtVersion *qt = k ? QtKitInformation::qtVersion(k) : nullptr;
+
+    const FileNameList toExclude = qt ? qt->directoriesToIgnoreInProjectTree() : FileNameList();
+
     auto root = new QmakeProFileNode(project, project->projectFilePath());
-    createTree(project->rootProFile(), root);
+    createTree(project->rootProFile(), root, toExclude);
 
     return root;
 }

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -358,14 +358,15 @@ void QmakeProject::updateQmlJSCodeModel()
         projectInfo.activeResourceFiles.append(exactResources);
         projectInfo.allResourceFiles.append(exactResources);
         projectInfo.allResourceFiles.append(cumulativeResources);
+        QString errorMessage;
         foreach (const QString &rc, exactResources) {
             QString contents;
-            if (m_qmakeVfs->readVirtualFile(rc, QMakeVfs::VfsExact, &contents))
+            if (m_qmakeVfs->readFile(rc, QMakeVfs::VfsExact, &contents, &errorMessage) == QMakeVfs::ReadOk)
                 projectInfo.resourceFileContents[rc] = contents;
         }
         foreach (const QString &rc, cumulativeResources) {
             QString contents;
-            if (m_qmakeVfs->readVirtualFile(rc, QMakeVfs::VfsCumulative, &contents))
+            if (m_qmakeVfs->readFile(rc, QMakeVfs::VfsCumulative, &contents, &errorMessage) == QMakeVfs::ReadOk)
                 projectInfo.resourceFileContents[rc] = contents;
         }
         if (!hasQmlLib) {

src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp

@@ -55,6 +55,21 @@ QString AddSignalHandlerDialog::signal() const
     return m_signal;
 }
 
+bool checkForPropertyChanges(const QString &signal)
+{
+    static const QStringList importantProperties = {"pressed","position","value",
+                                             "checked","currentIndex","index",
+                                             "text","currentText", "currentItem"};
+    if (!signal.endsWith("Changed"))
+        return true;
+
+    QString property = signal;
+    property.chop(7);
+
+    /* Some important property changes we keep */
+    return importantProperties.contains(property);
+}
+
 void AddSignalHandlerDialog::updateComboBox()
 {
     m_ui->comboBox->clear();
@@ -62,13 +77,11 @@ void AddSignalHandlerDialog::updateComboBox()
         if (m_ui->all->isChecked()) {
             m_ui->comboBox->addItem(signal);
         } else if (m_ui->properties->isChecked()) {
-            if (signal.contains(QLatin1String("Changed")))
+            if (signal.endsWith("Changed"))
                 m_ui->comboBox->addItem(signal);
-        } else {
-            if (!signal.contains(QLatin1String("Changed")))
+        } else if (checkForPropertyChanges(signal))
             m_ui->comboBox->addItem(signal);
     }
-    }
 }
 
 void AddSignalHandlerDialog::handleAccepted()

src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

@@ -840,8 +840,13 @@ void addItemToStackedContainer(const SelectionContext &selectionContext)
         RewriterTransaction transaction =
                 view->beginRewriterTransaction(QByteArrayLiteral("DesignerActionManager:addItemToStackedContainer"));
 
+        NodeMetaInfo itemMetaInfo = view->model()->metaInfo("QtQuick.Item", -1, -1);
+        QTC_ASSERT(itemMetaInfo.isValid(), return);
+        QTC_ASSERT(itemMetaInfo.majorVersion() == 2, return);
+
         QmlDesigner::ModelNode itemNode =
-                view->createModelNode("QtQuick.Item", view->majorQtQuickVersion(), view->minorQtQuickVersion());
+                view->createModelNode("QtQuick.Item", itemMetaInfo.majorVersion(), itemMetaInfo.minorVersion());
+
         container.defaultNodeListProperty().reparentHere(itemNode);
 
         if (potentialTabBar.isValid()) {// The stacked container is hooked up to a TabBar

src/plugins/qmldesigner/qmldesignerextension/texttool/textedititemwidget.cpp

@@ -46,10 +46,17 @@ TextEditItemWidget::~TextEditItemWidget()
     setWidget(0);
 }
 
-void TextEditItemWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void TextEditItemWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
     painter->fillRect(boundingRect(), Qt::white);
-    QGraphicsProxyWidget::paint(painter, option, widget);
+
+    /* Cursor painting is broken.
+     * QGraphicsProxyWidget::paint(painter, option, widget);
+     * We draw manually instead.
+    */
+
+    QPixmap pixmap = widget()->grab();
+    painter->drawPixmap(0, 0, pixmap);
 }
 
 QLineEdit* TextEditItemWidget::lineEdit() const

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -84,10 +84,13 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
                                              Constants::QMLTYPES_MIMETYPE,
                                              Constants::QMLUI_MIMETYPE };
         projectInfo.sourceFiles = project->files(Project::SourceFiles,
-                                                 [&qmlTypeNames](const FileNode *fn) {
+                                                 [&qmlTypeNames](const Node *n) {
+            if (const FileNode *fn = n->asFileNode()) {
                 return fn->fileType() == FileType::QML
                         && qmlTypeNames.contains(Utils::mimeTypeForFile(fn->filePath().toString(),
                                                                         MimeMatchMode::MatchExtension).name());
+            }
+            return false;
         });
         activeTarget = project->activeTarget();
     }

src/plugins/qtsupport/baseqtversion.cpp

@@ -570,6 +570,22 @@ FileName BaseQtVersion::mkspecsPath() const
     return result;
 }
 
+FileNameList BaseQtVersion::directoriesToIgnoreInProjectTree() const
+{
+    FileNameList result;
+    const FileName mkspecPathGet = mkspecsPath();
+    result.append(mkspecPathGet);
+
+    FileName mkspecPathSrc = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA", PropertyVariantSrc));
+    if (!mkspecPathSrc.isEmpty()) {
+        mkspecPathSrc.appendPath("mkspecs");
+        if (mkspecPathSrc != mkspecPathGet)
+            result.append(mkspecPathSrc);
+    }
+
+    return result;
+}
+
 QString BaseQtVersion::qtNamespace() const
 {
     ensureMkSpecParsed();

src/plugins/qtsupport/baseqtversion.h

@@ -212,6 +212,8 @@ public:
     Utils::FileName binPath() const;
     Utils::FileName mkspecsPath() const;
 
+    Utils::FileNameList directoriesToIgnoreInProjectTree() const;
+
     QString qtNamespace() const;
     QString qtLibInfix() const;
     bool isFrameworkBuild() const;

src/plugins/resourceeditor/resourceeditorplugin.cpp

@@ -222,7 +222,8 @@ void ResourceEditorPlugin::extensionsInitialized()
             FolderNode *const pn = file->parentFolderNode();
             QTC_ASSERT(pn, continue);
             const Utils::FileName path = file->filePath();
-            pn->replaceSubtree(file, new ResourceTopLevelNode(path, QString(), pn));
+            pn->replaceSubtree(file, new ResourceTopLevelNode(path, file->isGenerated(),
+                                                              QString(), pn));
         }
     });
 }

src/plugins/resourceeditor/resourcenode.cpp

@@ -70,7 +70,7 @@ public:
     {
         if (type == TypePermissions)
             return true;
-        auto newNode = new ResourceTopLevelNode(m_node->filePath(), m_node->contents(),
+        auto newNode = new ResourceTopLevelNode(m_node->filePath(), false, m_node->contents(),
                                                 m_node->parentFolderNode());
         m_node->parentFolderNode()->replaceSubtree(m_node, newNode);
         return true;
@@ -263,10 +263,11 @@ bool SimpleResourceFolderNode::renameFile(const QString &filePath, const QString
 
 } // Internal
 
-ResourceTopLevelNode::ResourceTopLevelNode(const FileName &filePath, const QString &contents,
-                                           FolderNode *parent)
+ResourceTopLevelNode::ResourceTopLevelNode(const FileName &filePath, bool generated,
+                                           const QString &contents, FolderNode *parent)
     : FolderNode(filePath)
 {
+    setIsGenerated(generated);
     setIcon(FileIconProvider::icon(filePath.toString()));
     if (contents.isEmpty()) {
         m_document = new ResourceFileWatcher(this);

src/plugins/resourceeditor/resourcenode.h

@@ -34,7 +34,8 @@ namespace Internal { class ResourceFileWatcher; }
 class RESOURCE_EXPORT ResourceTopLevelNode : public ProjectExplorer::FolderNode
 {
 public:
-    ResourceTopLevelNode(const Utils::FileName &filePath, const QString &contents, FolderNode *parent);
+    ResourceTopLevelNode(const Utils::FileName &filePath, bool generated,
+                         const QString &contents, FolderNode *parent);
     ~ResourceTopLevelNode() override;
 
     void addInternalNodes();

src/plugins/texteditor/generichighlighter/highlighter.cpp

@@ -45,6 +45,7 @@ namespace {
     static const QLatin1String kPop("#pop");
     static const QLatin1Char kBackSlash('\\');
     static const QLatin1Char kHash('#');
+    static const QLatin1Char kExclamationMark('!');
 }
 
 class HighlighterCodeFormatterData : public CodeFormatterData
@@ -414,8 +415,13 @@ void Highlighter::changeContext(const QString &contextName,
                                 const QSharedPointer<HighlightDefinition> &definition,
                                 const bool assignCurrent)
 {
-    if (contextName.startsWith(kPop)) {
-        const int count = contextName.splitRef(kHash, QString::SkipEmptyParts).size();
+    QString identifier = contextName;
+    if (identifier.startsWith(kPop)) {
+        const QStringList complexOrder = contextName.split(kExclamationMark);
+        const QString orders = complexOrder.first();
+        identifier = complexOrder.size() > 1 ? complexOrder[1] : QString();
+
+        const int count = orders.splitRef(kHash, QString::SkipEmptyParts).size();
         for (int i = 0; i < count; ++i) {
             if (m_contexts.isEmpty()) {
                 throw HighlighterException(
@@ -434,8 +440,9 @@ void Highlighter::changeContext(const QString &contextName,
                 setCurrentBlockState(
                     computeState(m_leadingObservableStates.value(currentSequence)));
         }
-    } else {
-        const QSharedPointer<Context> &context = definition->context(contextName);
+    }
+    if (!identifier.isEmpty()) {
+        const QSharedPointer<Context> &context = definition->context(identifier);
 
         if (context->isDynamic())
             pushDynamicContext(context);

src/tools/buildoutputparser/main.cpp

@@ -25,7 +25,9 @@
 
 #include "outputprocessor.h"
 
-#include <QCoreApplication>
+#include <utils/theme/theme_p.h>
+
+#include <QGuiApplication>
 #include <QFile>
 #include <QMetaObject>
 #include <QFileInfo>
@@ -35,6 +37,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+class DummyTheme : public Utils::Theme
+{
+public:
+    DummyTheme() : Utils::Theme(QLatin1String("dummy"))
+    {
+        const QPair<QColor, QString> colorEntry(QColor(Qt::red), QLatin1String("red"));
+        for (int i = 0; i < d->colors.count(); ++i)
+            d->colors[i] = colorEntry;
+    }
+};
+
 static void printUsage()
 {
     fprintf(stderr, "Usage: %s [--type <compiler type>] <file>\n",
@@ -48,10 +61,11 @@ static void printUsage()
     );
 }
 
-
 int main(int argc, char *argv[])
 {
-    QCoreApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
+    DummyTheme dummyTheme;
+    Utils::setCreatorTheme(&dummyTheme);
 
     QStringList args = app.arguments().mid(1);
     QString filePath;

src/tools/iostool/main.cpp

@@ -172,7 +172,7 @@ public:
     void stopRelayServers(int errorCode = 0);
     void writeMaybeBin(const QString &extraMsg, const char *msg, quintptr len);
     void errorMsg(const QString &msg);
-    void stopGdbRunner();
+    Q_INVOKABLE void stopGdbRunner();
 private:
     void stopGdbRunner2();
     void isTransferringApp(const QString &bundlePath, const QString &deviceId, int progress,

tests/auto/debugger/tst_dumpers.cpp

@@ -6748,6 +6748,32 @@ void tst_Dumpers::dumper_data()
             + Check("tc.3.bar", "15", "int");
 
 
+    QTest::newRow("BufArray")
+            << Data("#include <new>\n"
+                    "static int c = 0;\n"
+                    "struct Foo { int bar = c++; int baz = c++; };\n"
+                    "template<class T>\n"
+                    "struct QtcDumperTest_BufArray {\n"
+                    "   const int objSize = int(sizeof(T));\n"
+                    "   const int count = 10;\n"
+                    "   char *buffer;\n"
+                    "   QtcDumperTest_BufArray() {\n"
+                    "      buffer = new char[count * objSize];\n"
+                    "      for (int i = 0; i < count; ++i)\n"
+                    "         new(buffer + i * objSize) T;\n"
+                    "   }\n"
+                    "   ~QtcDumperTest_BufArray() { delete[] buffer; }\n"
+                    "};\n\n",
+                    "QtcDumperTest_BufArray<Foo> arr; unused(&arr);\n")
+               + Cxx11Profile()
+               + Check("arr.0.bar", "0", "int")
+               + Check("arr.0.baz", "1", "int")
+               + Check("arr.1.bar", "2", "int")
+               + Check("arr.1.baz", "3", "int")
+               + Check("arr.2.bar", "4", "int")
+               + Check("arr.2.baz", "5", "int");
+
+
     QTest::newRow("UndefinedStaticMembers")
             << Data("struct Foo { int a = 15; static int b; }; \n",
                     "Foo f; unused(&f);\n")

tests/system/suite_tools/tst_git_clone/test.py

@@ -33,7 +33,7 @@ def verifyCloneLog(targetDir, canceled):
         summary = "Failed."
     else:
         finish = findObject(":Git Repository Clone.Finish_QPushButton")
-        waitFor("finish.enabled", 30000)
+        waitFor("finish.enabled", 90000)
         cloneLog = str(waitForObject(":Git Repository Clone.logPlainTextEdit_QPlainTextEdit").plainText)
         if "fatal: " in cloneLog:
             test.warning("Cloning failed outside Creator.")

tests/system/suite_tools/tst_git_local/test.py

@@ -145,9 +145,9 @@ def verifyClickCommit():
                         "Verifying whether diff editor contains pointless_header.h file.")
             test.verify(pointlessHeader not in diffOriginal,
                         "Verifying whether original does not contain pointless_header.h file.")
-            test.verify("HEADERS  += mainwindow.h \\\n    pointless_header.h\n" in diffChanged,
+            test.verify("HEADERS += \\\n        mainwindow.h \\\n    pointless_header.h\n" in diffChanged,
                         "Verifying whether diff editor has pointless_header.h listed in pro file.")
-            test.verify("HEADERS  += mainwindow.h\n\n" in diffOriginal
+            test.verify("HEADERS += \\\n        mainwindow.h\n\n" in diffOriginal
                         and "pointless_header.h" not in diffOriginal,
                         "Verifying whether original has no additional header in pro file.")
         test.verify(original.readOnly and changed.readOnly,