summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-09-15 12:57:25 +0300
committerOrgad Shaneh <orgads@gmail.com>2014-09-15 15:13:18 +0200
commit5078b70ddbecca33820c59aabb1597650915c34b (patch)
tree07dff6ba2aa5d86574b44cc32a9ace0d1ea58e8d
parent5e4f3a4f4eb34863894264aec1a1b8788363c8ca (diff)
downloadqt-creator-5078b70ddbecca33820c59aabb1597650915c34b.tar.gz
ClearCase: Fix unreserved checkout
Task-number: QTCREATORBUG-12847 Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index d98016a465..9dac424728 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1599,9 +1599,11 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
else
args << QLatin1String("-c") << comment;
args << QLatin1String("-query");
- if (coDialog.isReserved())
+ const bool reserved = coDialog.isReserved();
+ const bool unreserved = !reserved || coDialog.isUnreserved();
+ if (reserved)
args << QLatin1String("-reserved");
- if (coDialog.isUnreserved())
+ if (unreserved)
args << QLatin1String("-unreserved");
if (coDialog.isPreserveTime())
args << QLatin1String("-ptime");