This change partially reverts 1bfc7f68 about QT_HAS_BUILTIN define and undef in src/corelib/tools/qsimd_p.h. This change is also squashed with "Fall back to c++11 standard compiler flag for host builds" which is done by Peter Seiderer. Conflicts: mkspecs/features/default_post.prf src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch src/3rdparty/sqlite/sqlite3.c src/corelib/tools/qsimd_p.h src/gui/kernel/qevent.cpp src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface_p.h src/plugins/bearer/blackberry/blackberry.pro src/plugins/platforms/cocoa/qcocoasystemsettings.mm src/plugins/platformthemes/gtk2/gtk2.pro src/plugins/styles/bb10style/bb10style.pro src/sql/drivers/sqlite2/qsql_sqlite2.cpp tools/configure/configureapp.cpp Task-number: QTBUG-51644 Done-with: Peter Seiderer <ps.report@gmx.net> Change-Id: I6100d6ace31b2e8d41a95f0b5d5ebf8f1fd88b44
306 lines
9.7 KiB
C++
306 lines
9.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the QtCore module of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 3 requirements
|
|
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 2.0 or (at your option) the GNU General
|
|
** Public license version 3 or any later version approved by the KDE Free
|
|
** Qt Foundation. The licenses are as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
|
** https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef QPROCESS_H
|
|
#define QPROCESS_H
|
|
|
|
#include <QtCore/qiodevice.h>
|
|
#include <QtCore/qstringlist.h>
|
|
#include <QtCore/qshareddata.h>
|
|
|
|
#include <functional>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
|
#ifndef QT_NO_PROCESS
|
|
|
|
#if !defined(Q_OS_WIN) || defined(Q_QDOC)
|
|
typedef qint64 Q_PID;
|
|
#else
|
|
QT_END_NAMESPACE
|
|
typedef struct _PROCESS_INFORMATION *Q_PID;
|
|
typedef struct _SECURITY_ATTRIBUTES Q_SECURITY_ATTRIBUTES;
|
|
typedef struct _STARTUPINFOW Q_STARTUPINFO;
|
|
QT_BEGIN_NAMESPACE
|
|
#endif
|
|
|
|
class QProcessPrivate;
|
|
class QProcessEnvironmentPrivate;
|
|
|
|
class Q_CORE_EXPORT QProcessEnvironment
|
|
{
|
|
public:
|
|
QProcessEnvironment();
|
|
QProcessEnvironment(const QProcessEnvironment &other);
|
|
~QProcessEnvironment();
|
|
#ifdef Q_COMPILER_RVALUE_REFS
|
|
QProcessEnvironment &operator=(QProcessEnvironment && other) Q_DECL_NOTHROW { swap(other); return *this; }
|
|
#endif
|
|
QProcessEnvironment &operator=(const QProcessEnvironment &other);
|
|
|
|
void swap(QProcessEnvironment &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
|
|
|
|
bool operator==(const QProcessEnvironment &other) const;
|
|
inline bool operator!=(const QProcessEnvironment &other) const
|
|
{ return !(*this == other); }
|
|
|
|
bool isEmpty() const;
|
|
void clear();
|
|
|
|
bool contains(const QString &name) const;
|
|
void insert(const QString &name, const QString &value);
|
|
void remove(const QString &name);
|
|
QString value(const QString &name, const QString &defaultValue = QString()) const;
|
|
|
|
QStringList toStringList() const;
|
|
|
|
QStringList keys() const;
|
|
|
|
void insert(const QProcessEnvironment &e);
|
|
|
|
static QProcessEnvironment systemEnvironment();
|
|
|
|
private:
|
|
friend class QProcessPrivate;
|
|
friend class QProcessEnvironmentPrivate;
|
|
QSharedDataPointer<QProcessEnvironmentPrivate> d;
|
|
};
|
|
|
|
Q_DECLARE_SHARED(QProcessEnvironment)
|
|
|
|
class Q_CORE_EXPORT QProcess : public QIODevice
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
enum ProcessError {
|
|
FailedToStart, //### file not found, resource error
|
|
Crashed,
|
|
Timedout,
|
|
ReadError,
|
|
WriteError,
|
|
UnknownError
|
|
};
|
|
Q_ENUM(ProcessError)
|
|
|
|
enum ProcessState {
|
|
NotRunning,
|
|
Starting,
|
|
Running
|
|
};
|
|
Q_ENUM(ProcessState)
|
|
|
|
enum ProcessChannel {
|
|
StandardOutput,
|
|
StandardError
|
|
};
|
|
Q_ENUM(ProcessChannel)
|
|
|
|
enum ProcessChannelMode {
|
|
SeparateChannels,
|
|
MergedChannels,
|
|
ForwardedChannels,
|
|
ForwardedOutputChannel,
|
|
ForwardedErrorChannel
|
|
};
|
|
Q_ENUM(ProcessChannelMode)
|
|
|
|
enum InputChannelMode {
|
|
ManagedInputChannel,
|
|
ForwardedInputChannel
|
|
};
|
|
Q_ENUM(InputChannelMode)
|
|
|
|
enum ExitStatus {
|
|
NormalExit,
|
|
CrashExit
|
|
};
|
|
Q_ENUM(ExitStatus)
|
|
|
|
explicit QProcess(QObject *parent = Q_NULLPTR);
|
|
virtual ~QProcess();
|
|
|
|
void start(const QString &program, const QStringList &arguments, OpenMode mode = ReadWrite);
|
|
#if !defined(QT_NO_PROCESS_COMBINED_ARGUMENT_START)
|
|
void start(const QString &command, OpenMode mode = ReadWrite);
|
|
#endif
|
|
void start(OpenMode mode = ReadWrite);
|
|
bool open(OpenMode mode = ReadWrite) Q_DECL_OVERRIDE;
|
|
|
|
QString program() const;
|
|
void setProgram(const QString &program);
|
|
|
|
QStringList arguments() const;
|
|
void setArguments(const QStringList & arguments);
|
|
|
|
ProcessChannelMode readChannelMode() const;
|
|
void setReadChannelMode(ProcessChannelMode mode);
|
|
ProcessChannelMode processChannelMode() const;
|
|
void setProcessChannelMode(ProcessChannelMode mode);
|
|
InputChannelMode inputChannelMode() const;
|
|
void setInputChannelMode(InputChannelMode mode);
|
|
|
|
ProcessChannel readChannel() const;
|
|
void setReadChannel(ProcessChannel channel);
|
|
|
|
void closeReadChannel(ProcessChannel channel);
|
|
void closeWriteChannel();
|
|
|
|
void setStandardInputFile(const QString &fileName);
|
|
void setStandardOutputFile(const QString &fileName, OpenMode mode = Truncate);
|
|
void setStandardErrorFile(const QString &fileName, OpenMode mode = Truncate);
|
|
void setStandardOutputProcess(QProcess *destination);
|
|
|
|
#if defined(Q_OS_WIN)
|
|
QString nativeArguments() const;
|
|
void setNativeArguments(const QString &arguments);
|
|
struct CreateProcessArguments
|
|
{
|
|
const wchar_t *applicationName;
|
|
wchar_t *arguments;
|
|
Q_SECURITY_ATTRIBUTES *processAttributes;
|
|
Q_SECURITY_ATTRIBUTES *threadAttributes;
|
|
bool inheritHandles;
|
|
unsigned long flags;
|
|
void *environment;
|
|
const wchar_t *currentDirectory;
|
|
Q_STARTUPINFO *startupInfo;
|
|
Q_PID processInformation;
|
|
};
|
|
typedef std::function<void(CreateProcessArguments *)> CreateProcessArgumentModifier;
|
|
CreateProcessArgumentModifier createProcessArgumentsModifier() const;
|
|
void setCreateProcessArgumentsModifier(CreateProcessArgumentModifier modifier);
|
|
#endif // Q_OS_WIN
|
|
|
|
QString workingDirectory() const;
|
|
void setWorkingDirectory(const QString &dir);
|
|
|
|
void setEnvironment(const QStringList &environment);
|
|
QStringList environment() const;
|
|
void setProcessEnvironment(const QProcessEnvironment &environment);
|
|
QProcessEnvironment processEnvironment() const;
|
|
|
|
QProcess::ProcessError error() const;
|
|
QProcess::ProcessState state() const;
|
|
|
|
// #### Qt 5: Q_PID is a pointer on Windows and a value on Unix
|
|
Q_PID pid() const;
|
|
qint64 processId() const;
|
|
|
|
bool waitForStarted(int msecs = 30000);
|
|
bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
|
|
bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
|
|
bool waitForFinished(int msecs = 30000);
|
|
|
|
QByteArray readAllStandardOutput();
|
|
QByteArray readAllStandardError();
|
|
|
|
int exitCode() const;
|
|
QProcess::ExitStatus exitStatus() const;
|
|
|
|
// QIODevice
|
|
qint64 bytesAvailable() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override
|
|
qint64 bytesToWrite() const Q_DECL_OVERRIDE;
|
|
bool isSequential() const Q_DECL_OVERRIDE;
|
|
bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override
|
|
void close() Q_DECL_OVERRIDE;
|
|
bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override
|
|
|
|
static int execute(const QString &program, const QStringList &arguments);
|
|
static int execute(const QString &command);
|
|
|
|
static bool startDetached(const QString &program, const QStringList &arguments,
|
|
const QString &workingDirectory
|
|
#if defined(Q_QDOC)
|
|
= QString()
|
|
#endif
|
|
, qint64 *pid = Q_NULLPTR);
|
|
#if !defined(Q_QDOC)
|
|
static bool startDetached(const QString &program, const QStringList &arguments); // ### Qt6: merge overloads
|
|
#endif
|
|
static bool startDetached(const QString &command);
|
|
|
|
static QStringList systemEnvironment();
|
|
|
|
static QString nullDevice();
|
|
|
|
public Q_SLOTS:
|
|
void terminate();
|
|
void kill();
|
|
|
|
Q_SIGNALS:
|
|
void started(QPrivateSignal);
|
|
void finished(int exitCode); // ### Qt 6: merge the two signals with a default value
|
|
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
|
#if QT_DEPRECATED_SINCE(5,6)
|
|
void error(QProcess::ProcessError error);
|
|
#endif
|
|
void errorOccurred(QProcess::ProcessError error);
|
|
void stateChanged(QProcess::ProcessState state, QPrivateSignal);
|
|
|
|
void readyReadStandardOutput(QPrivateSignal);
|
|
void readyReadStandardError(QPrivateSignal);
|
|
|
|
protected:
|
|
void setProcessState(ProcessState state);
|
|
|
|
virtual void setupChildProcess();
|
|
|
|
// QIODevice
|
|
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
|
|
qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
|
|
|
|
private:
|
|
Q_DECLARE_PRIVATE(QProcess)
|
|
Q_DISABLE_COPY(QProcess)
|
|
|
|
Q_PRIVATE_SLOT(d_func(), bool _q_canReadStandardOutput())
|
|
Q_PRIVATE_SLOT(d_func(), bool _q_canReadStandardError())
|
|
Q_PRIVATE_SLOT(d_func(), bool _q_canWrite())
|
|
Q_PRIVATE_SLOT(d_func(), bool _q_startupNotification())
|
|
Q_PRIVATE_SLOT(d_func(), bool _q_processDied())
|
|
friend class QProcessManager;
|
|
};
|
|
|
|
#endif // QT_NO_PROCESS
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // QPROCESS_H
|