feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/plugins/find/treeviewfind.cpp

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe
This commit is contained in:
Eike Ziller
2012-05-10 08:14:36 +02:00
parent ad3e94f67c 5d92a73c82
commit 0a0de08efb
10 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/debugger.py
+1 -1
View File
@@ -140,7 +140,7 @@ def doSimpleDebugging(currentConfigName, pressContinueCount=1, expectedBPOrder=[
def __startDebugger__(config):
clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton"))
handleDebuggerWarnings(config)
hasNotTimedOut = waitFor("object.exists(':Debugger Toolbar.Continue_QToolButton')", 20000)
hasNotTimedOut = waitFor("object.exists(':Debugger Toolbar.Continue_QToolButton')", 60000)
try:
mBox = findObject(":Failed to start application_QMessageBox")
mBoxText = mBox.text