summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-04 11:34:26 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-08 08:44:24 +0000
commit896da75550738a08f44dfeb72f09ace3a147b0ee (patch)
treef9073d96841a76fae34462cc0a51f61900c22da7
parent4bb00d9d069b58037c0ec01233069ac244fb7c22 (diff)
make the enums of QProcess known to the meta object system
This enables users to construct enum values from strings and provides useful qDebug operators. Task-number: QTBUG-10777 Change-Id: Ia3592f00d559b980b4875ee8fb5e8ffb4328d464 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/io/qprocess.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 078217ea0b..32fa4aa866 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -104,15 +104,21 @@ public:
WriteError,
UnknownError
};
+ Q_ENUM(ProcessError)
+
enum ProcessState {
NotRunning,
Starting,
Running
};
+ Q_ENUM(ProcessState)
+
enum ProcessChannel {
StandardOutput,
StandardError
};
+ Q_ENUM(ProcessChannel)
+
enum ProcessChannelMode {
SeparateChannels,
MergedChannels,
@@ -120,14 +126,19 @@ public:
ForwardedOutputChannel,
ForwardedErrorChannel
};
+ Q_ENUM(ProcessChannelMode)
+
enum InputChannelMode {
ManagedInputChannel,
ForwardedInputChannel
};
+ Q_ENUM(InputChannelMode)
+
enum ExitStatus {
NormalExit,
CrashExit
};
+ Q_ENUM(ExitStatus)
explicit QProcess(QObject *parent = 0);
virtual ~QProcess();