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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
This commit is contained in:
Eike Ziller
2017-10-25 16:07:21 +02:00
parent 81f5c1c8ec dd60923713
commit 7f626b1182
108 changed files with 964 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gerrit/gerritdialog.ui
View File

@@ -88,7 +88,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>400</height>
<height>350</height>
</size>
</property>
<property name="title">
@@ -188,7 +188,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>200</height>
<height>175</height>
</size>
</property>
<property name="title">

4
src/plugins/git/remotedialog.cpp
View File

@@ -74,7 +74,7 @@ public:
if (m_remoteNames.contains(input)) {
if (errorMessage)
*errorMessage = tr("A remote with the name \"%1\" already exists.").arg(input);
*errorMessage = RemoteDialog::tr("A remote with the name \"%1\" already exists.").arg(input);
return false;
}
@@ -91,7 +91,7 @@ public:
const GitRemote r(edit->text());
if (!r.isValid && errorMessage)
*errorMessage = tr("The URL may not be valid.");
*errorMessage = RemoteDialog::tr("The URL may not be valid.");
return r.isValid;
});