Merge remote-tracking branch 'origin/4.2'

Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
2016-11-28 15:27:51 +02:00
parent f69a466534 96256d1ecc
commit 7b3642cce4
128 changed files with 3030 additions and 1713 deletions
--- a/src/plugins/qmldesigner/components/debugview/debugview.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp
@@ -342,7 +342,7 @@ void DebugView::instanceInformationsChanged(const QMultiHash<ModelNode, Informat
            message << informationChangedHash.value(modelNode);
        }

-        logInstance(tr("Instance completed"), string);
+        logInstance(tr("Instance information change"), string);
    }

 }