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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
This commit is contained in:
Eike Ziller
2017-09-19 12:00:16 +02:00
parent fe1cbd0f87 b58dadfecc
commit 3d9cf954e2
40 changed files with 9999 additions and 6050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -26,7 +26,6 @@
#include "gerritpushdialog.h"
#include "ui_gerritpushdialog.h"
#include "branchcombobox.h"
#include "gerritserver.h"
#include "../gitplugin.h"
#include "../gitclient.h"
@@ -129,6 +128,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
m_ui->repositoryLabel->setText(QDir::toNativeSeparators(workingDir));
m_ui->remoteComboBox->setRepository(workingDir);
m_ui->remoteComboBox->setParameters(parameters);
m_ui->remoteComboBox->setAllowDups(true);
PushItemDelegate *delegate = new PushItemDelegate(m_ui->commitView);
delegate->setParent(this);

13
src/plugins/git/gerrit/gerritremotechooser.cpp
View File

@@ -80,6 +80,11 @@ void GerritRemoteChooser::setFallbackEnabled(bool value)
m_enableFallback = value;
}
void GerritRemoteChooser::setAllowDups(bool value)
{
m_allowDups = value;
}
bool GerritRemoteChooser::setCurrentRemote(const QString &remoteName)
{
for (int i = 0, total = m_remoteComboBox->count(); i < total; ++i) {
@@ -118,9 +123,11 @@ bool GerritRemoteChooser::updateRemotes(bool forceReload)
void GerritRemoteChooser::addRemote(const GerritServer &server, const QString &name)
{
for (auto remote : m_remotes) {
if (remote.second == server)
return;
if (!m_allowDups) {
for (auto remote : m_remotes) {
if (remote.second == server)
return;
}
}
m_remoteComboBox->addItem(server.host + QString(" (%1)").arg(name));
m_remotes.push_back({ name, server });

2
src/plugins/git/gerrit/gerritremotechooser.h
View File

@@ -48,6 +48,7 @@ public:
void setRepository(const QString &repository);
void setParameters(QSharedPointer<GerritParameters> parameters);
void setFallbackEnabled(bool value);
void setAllowDups(bool value);
bool setCurrentRemote(const QString &remoteName);
bool updateRemotes(bool forceReload);
@@ -68,6 +69,7 @@ private:
QToolButton *m_resetRemoteButton = nullptr;
bool m_updatingRemotes = false;
bool m_enableFallback = false;
bool m_allowDups = false;
using NameAndServer = std::pair<QString, GerritServer>;
std::vector<NameAndServer> m_remotes;
};