diff options
| author | Eike Ziller <[email protected]> | 2012-10-05 20:51:31 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-10-05 20:51:31 +0200 |
| commit | 68c796e2449673a85f7ebbd79360b52623beed2b (patch) | |
| tree | 052963a86224a5290438e67aebd018fa9a9b4fda /src/plugins/clearcase/clearcaseplugin.cpp | |
| parent | 43f2c77a42d6f50dd5b21aeee88ef0a78eae41ee (diff) | |
| parent | 0fc9e7c87735d5cc4ecadbe6d4656f620e2259cd (diff) | |
Merge origin/2.6
Conflicts:
src/libs/utils/fileutils.cpp
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
src/plugins/cmakeprojectmanager/cmakeproject.cpp
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
src/plugins/cmakeprojectmanager/makestep.cpp
src/plugins/qtsupport/baseqtversion.cpp
Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
Diffstat (limited to 'src/plugins/clearcase/clearcaseplugin.cpp')
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 65169666ab4..b1d5410e6fa 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -225,6 +225,10 @@ bool ClearCasePlugin::isCheckInEditorOpen() const */ QString ClearCasePlugin::findTopLevel(const QString &directory) const { + if ((directory == m_topLevel) || + Utils::FileName::fromString(directory).isChildOf(Utils::FileName::fromString(m_topLevel))) + return m_topLevel; + // Snapshot view QString topLevel = findRepositoryForDirectory(directory, QLatin1String(ClearCase::Constants::CLEARCASE_ROOT_FILE)); @@ -232,8 +236,6 @@ QString ClearCasePlugin::findTopLevel(const QString &directory) const return topLevel; // Dynamic view - if (directory.startsWith(m_topLevel) && directory.at(m_topLevel.size()) == QLatin1Char('/')) - return m_topLevel; bool isDynamic; ccGetView(directory, &isDynamic); if (isDynamic) { |