Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f

5 files changed, 7 insertions, 6 deletions

diff --git a/tests/system/objects.map b/tests/system/objects.map
index efdbb4543d..5b4e33a68a 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -16,7 +16,6 @@
 :*Qt Creator.Widget Box_QDockWidget	{name='WidgetBoxDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Widget Box'}
 :*Qt Creator.findEdit_Utils::FilterLineEdit	{name='findEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Core::Internal::FancyToolButton	{occurrence='3' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:*Qt Creator_Help::Internal::HelpViewer	{type='Help::Internal::HelpViewer' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Utils::FilterLineEdit	{type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Utils::IconButton	{occurrence='4' type='Utils::IconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :About Qt Creator_Core::Internal::VersionDialog	{type='Core::Internal::VersionDialog' unnamed='1' visible='1' windowTitle='About Qt Creator'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 9bab471de6..07e0317cfe 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -240,7 +240,8 @@ def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl =
     __createProjectHandleLastPage__(expectedFiles, addToVersionControl)
 
     progressBarWait(20000)
-    __verifyFileCreation__(path, expectedFiles)
+    if checks:
+        __verifyFileCreation__(path, expectedFiles)
     return checkedTargets
 
 # Creates a Qt Console project
@@ -264,7 +265,8 @@ def createProject_Qt_Console(path, projectName, checks = True):
     __createProjectHandleLastPage__(expectedFiles)
 
     progressBarWait(10000)
-    __verifyFileCreation__(path, expectedFiles)
+    if checks:
+        __verifyFileCreation__(path, expectedFiles)
     return checkedTargets
 
 def createNewQtQuickApplication(workingDir, projectName = None,
diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py
index 69e8e0e956..e7ece48b46 100755
--- a/tests/system/suite_HELP/tst_HELP04/test.py
+++ b/tests/system/suite_HELP/tst_HELP04/test.py
@@ -111,7 +111,7 @@ def main():
             mouseClick(waitForObject(":Hits_QCLuceneResultWidget"), 1, 1, 0, Qt.LeftButton)
             type(waitForObject(":Hits_QCLuceneResultWidget"), "<Tab>")
             type(waitForObject(":Hits_QCLuceneResultWidget"), "<Return>")
-            waitFor("__getUrl__() != url or selText != __getSelectedText__()")
+            waitFor("__getUrl__() != url or selText != __getSelectedText__()", 20000)
             # verify if search keyword is found in results
             test.verify(searchKeyword.lower() in __getSelectedText__().lower(),
                         searchKeyword + " search result can be found")
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py
index 91fb5ef1d2..708d6b14a6 100755
--- a/tests/system/suite_WELP/tst_WELP01/test.py
+++ b/tests/system/suite_WELP/tst_WELP01/test.py
@@ -63,7 +63,7 @@ def main():
     if not startedWithoutPluginError():
         return
     installLazySignalHandler(":QWebPage","loadFinished(bool)", "webPageContentLoaded")
-    installLazySignalHandler(":*Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
+    installLazySignalHandler(":Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
                              "webPageContentLoaded")
     setAlwaysStartFullHelp()
     addCurrentCreatorDocumentation()
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index f7f79bf155..fb84563eb9 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -68,7 +68,7 @@ def main():
     if not startedWithoutPluginError():
         return
     installLazySignalHandler(":QWebPage","loadFinished(bool)", "webPageContentLoaded")
-    installLazySignalHandler(":*Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
+    installLazySignalHandler(":Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
                              "webPageContentLoaded")
     qt5sdkPath = qt5SDKPath()
     qchs = [os.path.join(sdkPath, "Documentation", "qt.qch"),