feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Register metatypes for QProcess enums

Browse Source 
Apparently they aren't automatically registered on Qt 5.5

Change-Id: I0932cc7c5f56019300380ebb905d67d99eb8e9d0
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Ulf Hermann
2016-06-08 13:30:30 +02:00
parent 59adfb10b5
commit dd4e185eb3
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/qtcprocess.cpp
View File

@@ -667,6 +667,17 @@ bool QtcProcess::prepareCommand(const QString &command, const QString &arguments
return true; return true;
} }
QtcProcess::QtcProcess(QObject *parent)
: QProcess(parent),
m_haveEnv(false),
m_useCtrlCStub(false)
{
static int qProcessExitStatusMeta = qRegisterMetaType<QProcess::ExitStatus>();
static int qProcessProcessErrorMeta = qRegisterMetaType<QProcess::ProcessError>();
Q_UNUSED(qProcessExitStatusMeta);
Q_UNUSED(qProcessProcessErrorMeta);
}
void QtcProcess::setUseCtrlCStub(bool enabled) void QtcProcess::setUseCtrlCStub(bool enabled)
{ {
// Do not use the stub in debug mode. Activating the stub will shut down // Do not use the stub in debug mode. Activating the stub will shut down

9
src/libs/utils/qtcprocess.h
View File

@@ -37,11 +37,7 @@ class QTCREATOR_UTILS_EXPORT QtcProcess : public QProcess
Q_OBJECT Q_OBJECT
public: public:
QtcProcess(QObject *parent = 0) QtcProcess(QObject *parent = 0);
: QProcess(parent),
m_haveEnv(false)
, m_useCtrlCStub(false)
{}
void setEnvironment(const Environment &env) void setEnvironment(const Environment &env)
{ m_environment = env; m_haveEnv = true; } { m_environment = env; m_haveEnv = true; }
void setCommand(const QString &command, const QString &arguments) void setCommand(const QString &command, const QString &arguments)
@@ -152,3 +148,6 @@ private:
}; };
} // namespace Utils } // namespace Utils
Q_DECLARE_METATYPE(QProcess::ExitStatus);
Q_DECLARE_METATYPE(QProcess::ProcessError);