Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602

src/plugins/debugger/qml/qmlengine.cpp

@@ -518,7 +518,7 @@ void QmlEngine::serviceConnectionError(const QString &serviceName)
 
 bool QmlEngine::canDisplayTooltip() const
 {
-    return state() == InferiorRunOk || state() == InferiorStopOk;
+    return false;
 }
 
 void QmlEngine::filterApplicationMessage(const QString &output, int /*channel*/)

src/plugins/debugger/qml/qmlv8debuggerclient.cpp

@@ -127,7 +127,6 @@ public:
 
     QScriptValue parser;
     QScriptValue stringifier;
-    QStringList scriptSourceRequests;
 
     QHash<int, QString> evaluatingExpression;
     QHash<int, QByteArray> localsAndWatchers;
@@ -952,6 +951,9 @@ void QmlV8DebuggerClient::executeDebuggerCommand(const QString &command)
 void QmlV8DebuggerClient::synchronizeWatchers(const QStringList &watchers)
 {
     SDEBUG(watchers);
+    if (d->engine->state() != InferiorStopOk)
+        return;
+
     foreach (const QString &exp, watchers) {
         StackHandler *stackHandler = d->engine->stackHandler();
         if (stackHandler->isContentsValid() && stackHandler->currentFrame().isUsable()) {

src/plugins/debugger/watchhandler.cpp

@@ -1629,7 +1629,7 @@ int WatchHandler::format(const QByteArray &iname) const
 {
     int result = AutomaticFormat;
     if (const WatchItem *item = m_model->findItem(iname)) {
-        int result = theIndividualFormats.value(item->d.iname, AutomaticFormat);
+        result = theIndividualFormats.value(item->d.iname, AutomaticFormat);
         if (result == AutomaticFormat)
             result = theTypeFormats.value(stripForFormat(item->d.type), AutomaticFormat);
     }