Merge remote-tracking branch 'origin/4.1' into 4.2

Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
2016-10-12 16:02:23 +02:00
parent a77c5836e9 169723dd87
commit 5b47c653c1
10 changed files with 2741 additions and 1608 deletions
@@ -647,6 +647,8 @@ def openVcsLog():
                                 "window=':Qt Creator_Core::Internal::MainWindow'}", 2000)
        if className(foundObj) != 'Core::OutputWindow':
            raise Exception("Found derived class, but not a pure QPlainTextEdit.")
+        waitForObject("{text='Version Control' type='QLabel' unnamed='1' visible='1' "
+                      "window=':Qt Creator_Core::Internal::MainWindow'}", 2000)
    except:
        invokeMenuItem("Window", "Output Panes", "Version Control")