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

Added second button to message box

Browse Source 
Change-Id: I59ec1c5000afcdd2c91ed55c32aaae11b95b620a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Robert Loehning
2013-04-05 18:33:10 +02:00
parent b8acad5365
commit 376a90e028
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/mergetool.cpp
View File

@@ -246,7 +246,7 @@ void MergeTool::readData()
} else if (m_merging && line.startsWith("Continue merging")) { } else if (m_merging && line.startsWith("Continue merging")) {
if (QMessageBox::question(0, tr("Continue Merging"), if (QMessageBox::question(0, tr("Continue Merging"),
tr("Continue merging other unresolved paths?"), tr("Continue merging other unresolved paths?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
m_process->write("y\n"); m_process->write("y\n");
} else { } else {
m_process->write("n\n"); m_process->write("n\n");