Properly use the "process" feature

Replace all QT_NO_PROCESS with QT_CONFIG(process), define it in
qconfig-bootstrapped.h, add QT_REQUIRE_CONFIG(process) to the qprocess
headers, exclude the sources from compilation when switched off, guard
header inclusions in places where compilation without QProcess seems
supported, drop some unused includes, and fix some tests that were
apparently designed to work with QT_NO_PROCESS but failed to.

Change-Id: Ieceea2504dea6fdf43b81c7c6b65c547b01b9714
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

1 files changed, 10 insertions, 8 deletions

diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
index 7bebe5e9e0..e8f56fc1d3 100644
--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
@@ -31,7 +31,9 @@
 
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QTemporaryDir>
-#include <QtCore/QProcess>
+#if QT_CONFIG(process)
+# include <QtCore/QProcess>
+#endif
 #include <QtCore/QByteArray>
 #include <QtCore/QString>
 #include <QtCore/QFileInfo>
@@ -66,7 +68,7 @@ static QString makespec()
 
 QT_BEGIN_NAMESPACE
 namespace QTest {
-#ifndef QT_NO_PROCESS
+#if QT_CONFIG(process)
     class QExternalProcess: public QProcess
     {
     protected:
@@ -87,7 +89,7 @@ namespace QTest {
         }
 #endif
     };
-#endif // !QT_NO_PROCESS
+#endif // QT_CONFIG(process)
 
     class QExternalTestPrivate
     {
@@ -554,7 +556,7 @@ namespace QTest {
 
     bool QExternalTestPrivate::runQmake()
     {
-#ifndef QT_NO_PROCESS
+#if QT_CONFIG(process)
         if (temporaryDirPath.isEmpty())
             qWarning() << "Temporary directory is expected to be non-empty";
 
@@ -597,14 +599,14 @@ namespace QTest {
         }
 
         return ok && exitCode == 0;
-#else // QT_NO_PROCESS
+#else // QT_CONFIG(process)
         return false;
-#endif // QT_NO_PROCESS
+#endif // QT_CONFIG(process)
     }
 
     bool QExternalTestPrivate::runMake(Target target)
     {
-#ifdef QT_NO_PROCESS
+#if !QT_CONFIG(process)
         return false;
 #else
         if (temporaryDirPath.isEmpty())
@@ -663,7 +665,7 @@ namespace QTest {
         std_err += make.readAllStandardError();
 
         return ok;
-#endif // !QT_NO_PROCESS
+#endif // QT_CONFIG(process)
     }
 
     bool QExternalTestPrivate::commonSetup(const QByteArray &body)