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

Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
This commit is contained in:
con
2009-10-29 18:54:17 +01:00
parent c1413ffa8a 2be0845c74
commit be3fafc311
82 changed files with 6357 additions and 4053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -249,11 +249,11 @@ bool DebuggerListener::coreAboutToClose()
tr("A debugging session is still in progress. Would you like to terminate it?") :
tr("A debugging session is still in progress. Terminating the session in the current"
" state (%1) can leave the target in an inconsistent state."
" Would you like to terminate it?")
" Would you still like to terminate it?")
.arg(QLatin1String(DebuggerManager::stateName(mgr->state())));
QMessageBox::StandardButton answer = QMessageBox::question(0, title, question,
QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No)
QMessageBox::StandardButton answer = QMessageBox::question(mgr->mainWindow(), title, question,
QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes);
if (answer != QMessageBox::Yes)
return false;
mgr->exitDebugger();
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);