aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce/perforceplugin.h
diff options
context:
space:
mode:
authorAlexander Kondratskiy <kholdstare0.0@gmail.com>2014-02-11 19:57:24 -0500
committerTobias Hunger <tobias.hunger@digia.com>2014-02-19 18:14:38 +0100
commit7f7b8f0ef723f6695389442a261666ba76fcc566 (patch)
tree6bb400bf93432f2fb28e921a4f5bf179062adfdd /src/plugins/perforce/perforceplugin.h
parent9310b652ebbfca345c33ec554d73be8d10bdec19 (diff)
VCS: Auto open for edit by Perforce no longer steals focus.
Refactoring appendLines to use MessageStyle enum. Task-number: QTCREATORBUG-8289 Change-Id: I3a023724e6616d1b60640cb4d70ce7dd8fe30338 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/perforce/perforceplugin.h')
-rw-r--r--src/plugins/perforce/perforceplugin.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 347131de6c6..bcee48574e3 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -85,7 +85,7 @@ public:
bool managesDirectory(const QString &directory, QString *topLevel = 0);
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
- bool vcsOpen(const QString &workingDir, const QString &fileName);
+ bool vcsOpen(const QString &workingDir, const QString &fileName, bool silently = false);
bool vcsAdd(const QString &workingDir, const QString &fileName);
bool vcsDelete(const QString &workingDir, const QString &filename);
bool vcsMove(const QString &workingDir, const QString &from, const QString &to);
@@ -158,7 +158,8 @@ private:
RunFullySynchronous = 0x20,
IgnoreExitCode = 0x40,
ShowBusyCursor = 0x80,
- LongTimeOut = 0x100
+ LongTimeOut = 0x100,
+ SilentStdOut = 0x200,
};
// args are passed as command line arguments