diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:07:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:36:44 +0200 |
| commit | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (patch) | |
| tree | 334ebaec198a7f31d1e3a4639c70fbb8bb116af2 /src/corelib/io/qprocess_wince.cpp | |
| parent | 52d30e2850769d589772576e4714a14241c7da6e (diff) | |
| parent | f57d8f1341587e6b2aa84b8404aa218432584206 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/qtestlib/tutorial5/containers.cpp
examples/widgets/tools/tools.pro
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/network/kernel/qdnslookup_unix.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/testlib/qtestcase.cpp
tools/configure/configureapp.cpp
Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
Diffstat (limited to 'src/corelib/io/qprocess_wince.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_wince.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess_wince.cpp b/src/corelib/io/qprocess_wince.cpp index 564b3f520d..824a6158dc 100644 --- a/src/corelib/io/qprocess_wince.cpp +++ b/src/corelib/io/qprocess_wince.cpp @@ -271,11 +271,9 @@ qint64 QProcessPrivate::pipeWriterBytesToWrite() const return 0; } -qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen) +bool QProcessPrivate::writeToStdin() { - Q_UNUSED(data); - Q_UNUSED(maxlen); - return -1; + return false; } bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDir, qint64 *pid) |