diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-09-08 11:07:09 +0300 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-09-10 18:13:11 +0200 |
| commit | 610c999e0c861960fe8989d95e1a2f1f9d06ae04 (patch) | |
| tree | c57b14645802a65f6c76fc89964cceb26ce20918 | |
| parent | b6eac08c2b1c3999df45421d5c7e2350056397dc (diff) | |
| download | qt-creator-610c999e0c861960fe8989d95e1a2f1f9d06ae04.tar.gz | |
ClearCase: Initialize checkout dialog after sync has finished
If it is initialized too early, activities combo is empty.
Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 1ea29ff15a..d98016a465 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1569,11 +1569,6 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName QFileInfo fi(workingDir, fileName); QString topLevel = currentState().topLevel(); QString absPath = fi.absoluteFilePath(); - const QString relFile = QDir(topLevel).relativeFilePath(absPath); - - const QString file = QDir::toNativeSeparators(relFile); - const QString title = QString::fromLatin1("Checkout %1").arg(file); - CheckOutDialog coDialog(title, m_viewData.isUcm); if (!m_settings.disableIndexer && (fi.isWritable() || vcsStatus(absPath).status == FileStatus::Unknown)) @@ -1582,6 +1577,12 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out.")); return true; } + + const QString relFile = QDir(topLevel).relativeFilePath(absPath); + const QString file = QDir::toNativeSeparators(relFile); + const QString title = QString::fromLatin1("Checkout %1").arg(file); + CheckOutDialog coDialog(title, m_viewData.isUcm); + // Only snapshot views can have hijacked files bool isHijacked = (!m_viewData.isDynamic && (vcsStatus(absPath).status & FileStatus::Hijacked)); if (!isHijacked) |