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

tests/system/shared/editor_utils.py

@@ -153,9 +153,12 @@ def verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, e
         for ty in additionalKeyPresses:
             type(editor, ty)
         rect = editor.cursorRect(editor.textCursor())
+        expectedToolTip = "{type='%s' visible='1'}" % expectedType
+        # wait for similar tooltips to disappear
+        checkIfObjectExists(expectedToolTip, False, 1000, True)
         sendEvent("QMouseEvent", editor, QEvent.MouseMove, rect.x+rect.width/2, rect.y+rect.height/2, Qt.NoButton, 0)
         try:
-            tip = waitForObject("{type='%s' visible='1'}" % expectedType)
+            tip = waitForObject(expectedToolTip)
         except:
             tip = None
         if tip == None:

tests/system/shared/qtcreator.py

@@ -39,6 +39,8 @@ import sys
 import errno;
 from datetime import datetime,timedelta;
 
+isQt53Build = os.getenv("SYSTEST_ISQT53BUILD") != "0"
+
 srcPath = ''
 SettingsPath = ''
 tmpSettingsDir = ''

tests/system/shared/utils.py

@@ -578,9 +578,6 @@ def dumpChildren(item):
     return [item.child(index) for index in range(item.childCount())]
 
 def writeTestResults(folder):
-    if squishinfo.version < 0x040200FF:
-        print "Skipping writing test results (Squish < 4.2)"
-        return
     if not os.path.exists(folder):
         print "Skipping writing test results (folder '%s' does not exist)." % folder
         return