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

Perforce: Allow working with localhost server

Browse Source 
It is useful for testing.

Change-Id: If110853f2ec035ecb60fd4c19819a002c3282dda
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2019-01-11 09:42:05 +02:00
committed by Orgad Shaneh
parent 1269217be3
commit 28f7c7935f
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/perforce/perforcechecker.cpp
View File

@@ -175,17 +175,6 @@ static inline QString clientRootFromOutput(const QString &in)
return QString(); return QString();
} }
// When p4 port and p4 user is set a preconfigured Root: is given, which doesn't relate with
// the current mapped project. In this case "Client:" has the same value as "Host:", which is an
// invalid case.
static inline bool clientAndHostAreEqual(const QString &in)
{
QString client = findTerm(in, QLatin1String("Client:"));
QString host = findTerm(in, QLatin1String("Host:"));
return client == host;
}
void PerforceChecker::parseOutput(const QString &response) void PerforceChecker::parseOutput(const QString &response)
{ {
if (!response.contains(QLatin1String("View:")) && !response.contains(QLatin1String("//depot/"))) { if (!response.contains(QLatin1String("View:")) && !response.contains(QLatin1String("//depot/"))) {
@@ -193,12 +182,6 @@ void PerforceChecker::parseOutput(const QString &response)
return; return;
} }
if (clientAndHostAreEqual(response)) {
// Is an invalid case. But not an error. QtC checks cmake install directories for
// p4 repositories, or the %temp% directory.
return;
}
const QString repositoryRoot = clientRootFromOutput(response); const QString repositoryRoot = clientRootFromOutput(response);
if (repositoryRoot.isEmpty()) { if (repositoryRoot.isEmpty()) {
//: Unable to determine root of the p4 client installation //: Unable to determine root of the p4 client installation