diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-11-25 08:57:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-11-25 08:57:10 +0100 |
| commit | 5e2e0e469b4eaf813ac45a11e448e1d4104f52a9 (patch) | |
| tree | 0a92fba6e2ac203693a550f20d29a2ec63784d1c /src/plugins/clearcase | |
| parent | b75919cb89707502e0b94bb4426530b9bb5fad63 (diff) | |
| parent | ba03037561412669707da3bdc481ef5411be2ec8 (diff) | |
| download | qt-creator-5e2e0e469b4eaf813ac45a11e448e1d4104f52a9.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0485b1bf75cc02f9fbcb5c05e350da91f491abe3
Diffstat (limited to 'src/plugins/clearcase')
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index a08ec4e96d..3afb4d2fff 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1663,7 +1663,7 @@ bool ClearCasePlugin::ccFileOp(const QString &workingDir, const QString &title, connect(buttonBox, SIGNAL(rejected()), &fileOpDlg, SLOT(reject())); if (!fileOpDlg.exec()) - return true; + return false; QString comment = commentEdit->toPlainText(); if (m_viewData.isUcm && actSelector->changed()) |