Merge remote-tracking branch 'origin/3.1'

2014-05-28 11:03:18 +02:00
parent b41edc05a1 14976ca142
commit 7c34567cb2
26 changed files with 13755 additions and 5291 deletions
--- a/src/plugins/git/gerrit/gerritoptionspage.cpp
+++ b/src/plugins/git/gerrit/gerritoptionspage.cpp
@@ -108,6 +108,7 @@ GerritOptionsWidget::GerritOptionsWidget(QWidget *parent)
    "Determines the protocol used to form a URL in case\n"
    "\"canonicalWebUrl\" is not configured in the file\n"
    "\"gerrit.config\"."));
+    setTabOrder(m_sshChooser, m_portSpinBox);
 }

 GerritParameters GerritOptionsWidget::parameters() const