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

Partial compile fix for current Qt dev and/or Qt 6

Browse Source 
This does not cover Utils::MapReduceOption with QVector, and code
that's not compiled on my machine.

Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-11-12 10:26:38 +01:00
parent 817f81cbfd
commit 0120e462b2
27 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gerrit/authenticationdialog.cpp
View File

@@ -150,10 +150,10 @@ bool AuthenticationDialog::setupCredentials()
replaceEntry(line, "login", user);
replaceEntry(line, "password", password);
}
out << line << endl;
out << line << Qt::endl;
}
if (!found)
out << "machine " << m_server->host << " login " << user << " password " << password << endl;
out << "machine " << m_server->host << " login " << user << " password " << password << Qt::endl;
Utils::FileSaver saver(m_netrcFileName, QFile::WriteOnly | QFile::Truncate | QFile::Text);
saver.write(netrcContents.toUtf8());
return saver.finalize();

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

@@ -55,6 +55,8 @@ enum { debug = 0 };
using namespace VcsBase;
using namespace Qt;
namespace Gerrit {
namespace Internal {