diff options
| author | Eike Ziller <[email protected]> | 2012-11-16 15:31:02 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-11-16 15:31:02 +0100 |
| commit | 3e7d94c3626c6904320018d2eedb1407925ed3d5 (patch) | |
| tree | 57479823338e07de3c3ce41bdda46abf58f4ac57 /src/plugins/clearcase/clearcaseplugin.cpp | |
| parent | 51bca851174c347edcc6b148ee3a67d70e5fa9eb (diff) | |
| parent | 5981b1e5509395bc0eb0ff7071e63a529b31fb11 (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
Diffstat (limited to 'src/plugins/clearcase/clearcaseplugin.cpp')
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index f2f30dfa99d..400b608afa2 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -82,6 +82,7 @@ #include <QMainWindow> #include <QMenu> #include <QMessageBox> +#include <QMetaObject> #include <QMutex> #include <QProcess> #include <QRegExp> @@ -89,7 +90,6 @@ #include <QtConcurrentRun> #include <QTemporaryFile> #include <QTextCodec> -#include <QTimer> #include <QtPlugin> #include <QUrl> #include <QUuid> @@ -643,11 +643,11 @@ void ClearCasePlugin::addCurrentFile() vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile()); } -void ClearCasePlugin::setStatus(const QString &file, ClearCase::Internal::FileStatus::Status status, bool update) +void ClearCasePlugin::setStatus(const QString &file, FileStatus::Status status, bool update) { m_statusMap->insert(file, FileStatus(status, QFileInfo(currentState().topLevel(), file).permissions())); if (update && (currentState().relativeCurrentFile() == file)) - updateStatusActions(); + QMetaObject::invokeMethod(this, "updateStatusActions"); } void ClearCasePlugin::undoCheckOutCurrent() @@ -973,7 +973,7 @@ void ClearCasePlugin::startCheckInActivity() last = file; } } - startCheckIn(state.currentProjectPath(), files); + startCheckIn(topLevel, files); } /* Start check in of files of a single repository by displaying @@ -1938,8 +1938,6 @@ void ClearCasePlugin::sync(QFutureInterface<void> &future, QString topLevel, QSt ClearCasePlugin *plugin = ClearCasePlugin::instance(); ClearCaseSync ccSync(plugin, plugin->m_statusMap); connect(&ccSync, SIGNAL(updateStreamAndView()), plugin, SLOT(updateStreamAndView())); - connect(&ccSync, SIGNAL(setStatus(QString, ClearCase::Internal::FileStatus::Status, bool)), - plugin, SLOT(setStatus(QString, ClearCase::Internal::FileStatus::Status, bool))); ccSync.run(future, topLevel, files); } |