From 614f37c8b559a722538c58dd1f65229cfca7d35b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 12 Mar 2015 22:58:56 -0700
Subject: 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>
---
 src/corelib/io/forkfd_qt.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/corelib/io')

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
-- 
cgit v1.2.3