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

Merge branch '2.3'

Browse Source 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
This commit is contained in:
Oswald Buddenhagen
2011-07-29 17:57:59 +02:00
parent 242b4280f9 7aaab4d050
commit 65c0eb5165
135 changed files with 7595 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ void BranchAddDialog::setTrackedBranchName(const QString &name, bool remote)
bool BranchAddDialog::track()
{
return m_ui->trackingCheckBox->isVisible() && m_ui->trackingCheckBox->isChecked();
return m_ui->trackingCheckBox->isChecked();
}
} // namespace Internal

1
src/plugins/git/branchdialog.cpp
View File

@@ -154,6 +154,7 @@ void BranchDialog::checkout()
Q_ASSERT(m_model->isLocal(idx));
m_model->checkoutBranch(idx);
enableButtons();
}
/* Prompt to delete a local branch and do so. */

9
src/plugins/git/branchmodel.cpp
View File

@@ -470,15 +470,18 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx)
QString output;
QStringList args;
args << QLatin1String("--contains") << sha(idx);
args << QLatin1String("-a") << QLatin1String("--contains") << sha(idx);
if (!m_client->synchronousBranchCmd(m_workingDirectory, args, &output, &errorMessage)) {
VCSBase::VCSBaseOutputWindow::instance()->appendError(errorMessage);
return false;
}
QStringList lines = output.split(QLatin1Char('/'), QString::SkipEmptyParts);
QStringList lines = output.split(QLatin1Char('\n'), QString::SkipEmptyParts);
foreach (const QString &l, lines) {
if (l.startsWith(QLatin1String(" ")) && l.count() >= 3)
QString currentBranch = l.mid(2); // remove first letters (those are either
// " " or "* " depending on whether it is
// the currently checked out branch or not)
if (currentBranch != branch)
return true;
}
return false;

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

@@ -1441,7 +1441,7 @@ GitCommand *GitClient::createCommand(const QString &workingDirectory,
connect(command, SIGNAL(outputData(QByteArray)), outputWindow, SLOT(appendData(QByteArray)));
}
} else {
QTC_ASSERT(editor, /**/);
QTC_CHECK(editor);
connect(command, SIGNAL(outputData(QByteArray)), editor, SLOT(setPlainTextDataFiltered(QByteArray)));
}