Merge remote-tracking branch 'origin/2.7'

Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
parent 364c95476e 6999e3c339
commit a2171c2d82
37 changed files with 178 additions and 84 deletions
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -76,7 +76,6 @@ QtcPlugin {
        "qml/RangeMover.qml",
        "qml/SelectionRange.qml",
        "qml/SelectionRangeDetails.qml",
-        "qml/StatusDisplay.qml",
        "qml/TimeDisplay.qml",
        "qml/TimeMarks.qml",
        "qml/qmlprofiler.qrc",