aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2019-01-11 09:42:05 +0200
committerOrgad Shaneh <orgads@gmail.com>2019-01-11 11:51:31 +0000
commit28f7c7935f4d142d5498d58465ff004462e996a6 (patch)
tree02b01340056866f9833fc2329620d2a8af8cedf3 /src/plugins/perforce
parent1269217be3ff6f02d398cb692836b9eb6e0ef068 (diff)
Perforce: Allow working with localhost server
It is useful for testing. Change-Id: If110853f2ec035ecb60fd4c19819a002c3282dda Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r--src/plugins/perforce/perforcechecker.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp
index 87b02e6ef3..92dd5a4cc4 100644
--- a/src/plugins/perforce/perforcechecker.cpp
+++ b/src/plugins/perforce/perforcechecker.cpp
@@ -175,17 +175,6 @@ static inline QString clientRootFromOutput(const QString &in)
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)
{
if (!response.contains(QLatin1String("View:")) && !response.contains(QLatin1String("//depot/"))) {
@@ -193,12 +182,6 @@ void PerforceChecker::parseOutput(const QString &response)
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);
if (repositoryRoot.isEmpty()) {
//: Unable to determine root of the p4 client installation