diff options
author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 21:21:40 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 16:50:21 +0100 |
commit | d3fdc132fe67806fe4a5ab73c43effa281c6d8a2 (patch) | |
tree | 611578b8cf49dd00f69e68ab7e4d445c1080b479 /src/corelib/io/qprocess.cpp | |
parent | 0c29259fd7c6f6283d17b598ec61347fc214b869 (diff) |
Remove Symbian specific code from QtCore.
Change-Id: I131303e28a12dccb96de3de4ca0073b389a9bbae
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
-rw-r--r-- | src/corelib/io/qprocess.cpp | 63 |
1 files changed, 7 insertions, 56 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index f8e924be3c..0a0097c887 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -97,10 +97,6 @@ QT_END_NAMESPACE #include <qwineventnotifier.h> #endif -#ifdef Q_OS_SYMBIAN -#include <e32std.h> -#endif - #ifndef QT_NO_PROCESS QT_BEGIN_NAMESPACE @@ -473,7 +469,7 @@ void QProcessPrivate::Channel::clear() used as an input source for QXmlReader, or for generating data to be uploaded using QNetworkAccessManager. - \note On Windows CE and Symbian, reading and writing to a process + \note On Windows CE, reading and writing to a process is not supported. When the process exits, QProcess reenters the \l NotRunning state @@ -524,10 +520,6 @@ void QProcessPrivate::Channel::clear() setWorkingDirectory(). By default, processes are run in the current working directory of the calling process. - \note On Symbian, setting environment or working directory - is not supported. The working directory will always be the private - directory of the running process. - \section1 Synchronous Process API QProcess provides a set of functions which allow it to be used @@ -564,16 +556,6 @@ void QProcessPrivate::Channel::clear() interpreter itself (\c{cmd.exe} on some Windows systems), and ask the interpreter to execute the desired command. - \section1 Symbian Platform Security Requirements - - On Symbian, processes which use the functions kill() or terminate() - must have the \c PowerMgmt platform security capability. If the client - process lacks this capability, these functions will fail. - - Platform security capabilities are added via the - \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY} - qmake variable. - \sa QBuffer, QFile, QTcpSocket */ @@ -780,10 +762,6 @@ QProcessPrivate::QProcessPrivate() #ifdef Q_OS_UNIX serial = 0; #endif -#ifdef Q_OS_SYMBIAN - symbianProcess = NULL; - processLaunched = false; -#endif } /*! \internal @@ -858,13 +836,6 @@ void QProcessPrivate::cleanup() #ifdef Q_OS_UNIX serial = 0; #endif -#ifdef Q_OS_SYMBIAN - if (symbianProcess) { - symbianProcess->Close(); - delete symbianProcess; - symbianProcess = NULL; - } -#endif } /*! \internal @@ -1400,15 +1371,14 @@ void QProcess::setStandardOutputProcess(QProcess *destination) dto->stdinChannel.pipeFrom(dfrom); } -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) /*! \since 4.7 Returns the additional native command line arguments for the program. - \note This function is available only on the Windows and Symbian - platforms. + \note This function is available only on the Windows platform. \sa setNativeArguments() */ @@ -1431,8 +1401,7 @@ QString QProcess::nativeArguments() const string which is \e appended to the string composed from the usual argument list, with a delimiting space. - \note This function is available only on the Windows and Symbian - platforms. + \note This function is available only on the Windows platform. \sa nativeArguments() */ @@ -1464,10 +1433,6 @@ QString QProcess::workingDirectory() const process in this directory. The default behavior is to start the process in the working directory of the calling process. - \note The working directory setting is ignored on Symbian; - the private directory of the process is considered its working - directory. - \sa workingDirectory(), start() */ void QProcess::setWorkingDirectory(const QString &dir) @@ -1613,7 +1578,7 @@ void QProcess::setEnvironment(const QStringList &environment) using setEnvironment() or setEnvironmentHash(). If no environment has been set, the environment of the calling process will be used. - \note The environment settings are ignored on Windows CE and Symbian, + \note The environment settings are ignored on Windows CE, as there is no concept of an environment. \sa processEnvironment(), setEnvironment(), systemEnvironment() @@ -2079,13 +2044,6 @@ void QProcess::start(const QString &program, OpenMode mode) event loop does not handle the WM_CLOSE message, can only be terminated by calling kill(). - On Symbian, this function requires platform security capability - \c PowerMgmt. If absent, the process will panic with KERN-EXEC 46. - - \note Terminating running processes from other processes will typically - cause a panic in Symbian due to platform security. - - \sa {Symbian Platform Security Requirements} \sa kill() */ void QProcess::terminate() @@ -2100,13 +2058,6 @@ void QProcess::terminate() On Windows, kill() uses TerminateProcess, and on Unix and Mac OS X, the SIGKILL signal is sent to the process. - On Symbian, this function requires platform security capability - \c PowerMgmt. If absent, the process will panic with KERN-EXEC 46. - - \note Killing running processes from other processes will typically - cause a panic in Symbian due to platform security. - - \sa {Symbian Platform Security Requirements} \sa terminate() */ void QProcess::kill() @@ -2259,7 +2210,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES) # include <crt_externs.h> # define environ (*_NSGetEnviron()) -#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) || (defined(Q_OS_MAC) && defined(QT_NO_CORESERVICES)) +#elif defined(Q_OS_WINCE) || (defined(Q_OS_MAC) && defined(QT_NO_CORESERVICES)) static char *qt_empty_environ[] = { 0 }; #define environ qt_empty_environ #elif !defined(Q_OS_WIN) @@ -2320,7 +2271,7 @@ QStringList QProcess::systemEnvironment() \relates QProcess Typedef for the identifiers used to represent processes on the underlying - platform. On Unix and Symbian, this corresponds to \l qint64; on Windows, it + platform. On Unix, this corresponds to \l qint64; on Windows, it corresponds to \c{_PROCESS_INFORMATION*}. \sa QProcess::pid() |