diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-23 08:29:43 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-23 08:29:43 +0100 |
| commit | 8e2d3e3b90d7d35d2c91fc09ab5a9cccac0823e8 (patch) | |
| tree | fe20315ed91d4babd73df69ece0af1d1550cb40c /src/corelib/io/forkfd_qt.cpp | |
| parent | bf17e30c8e98b311cdee397f1272e70863247ebc (diff) | |
| parent | f319b9b43c313dfa306a62c391e767bc6f14bdee (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9a10e1f3c9506ec8554d8f59b6300825ac730939
Diffstat (limited to 'src/corelib/io/forkfd_qt.cpp')
| -rw-r--r-- | src/corelib/io/forkfd_qt.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/forkfd_qt.cpp b/src/corelib/io/forkfd_qt.cpp index 9bb102e18f..141efeb08c 100644 --- a/src/corelib/io/forkfd_qt.cpp +++ b/src/corelib/io/forkfd_qt.cpp @@ -41,11 +41,7 @@ #include <QtCore/qatomic.h> #include "qprocess_p.h" -#ifdef QPROCESS_USE_SPAWN -# define FORKFD_NO_FORKFD -#else -# define FORKFD_NO_SPAWNFD -#endif +#define FORKFD_NO_SPAWNFD #if defined(QT_NO_DEBUG) && !defined(NDEBUG) # define NDEBUG |