diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-12 22:58:56 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-14 02:17:36 +0000 |
| commit | 614f37c8b559a722538c58dd1f65229cfca7d35b (patch) | |
| tree | 44d9c1444c16dabf7461cfef222a209e650387e0 /src/corelib | |
| parent | 048918d4bd73886e1a8999a06b7af2cd2ddbe5f2 (diff) | |
forkfd: make only one of forkfd or spawnfd be compiled
We only ever use one, never both.
Change-Id: Iee8cbc07c4434ce9b560ffff13caf94c05dba338
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/forkfd_qt.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/io/forkfd_qt.cpp b/src/corelib/io/forkfd_qt.cpp index 56a39f8df0..dadc42151c 100644 --- a/src/corelib/io/forkfd_qt.cpp +++ b/src/corelib/io/forkfd_qt.cpp @@ -40,6 +40,13 @@ #endif #include <QtCore/qatomic.h> +#include "qprocess_p.h" + +#ifdef QPROCESS_USE_SPAWN +# define FORKFD_NO_FORKFD +#else +# define FORKFD_NO_SPAWNFD +#endif #if defined(QT_NO_DEBUG) && !defined(NDEBUG) # define NDEBUG |