aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-03-02 11:41:47 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-03-02 11:43:49 +0000
commit408620ea99606f8b27ebf237fa3800e40e2c9cd3 (patch)
treed41afa0094cd711036cd749e8c4a3dc095dce50a
parent5cd4c2ced4b153f365ececf3a7c0a4536fed9fac (diff)
Fix building with -no-feature-process
Drop an unused include, don't try to build qmlplugindump in this case, and add some guards around QProcess includes and usages. Change-Id: I6ce5985a8dd1967f146016a7acd1ea31fb3bda2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--tests/auto/qml/qmlmin/tst_qmlmin.cpp8
-rw-r--r--tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp2
-rw-r--r--tests/auto/quick/examples/tst_examples.cpp1
-rw-r--r--tools/tools.pro2
4 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
index 3ed0aa7446..90868d2ead 100644
--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
@@ -29,7 +29,9 @@
#include <qtest.h>
#include <QLibraryInfo>
#include <QDir>
+#if QT_CONFIG(process)
#include <QProcess>
+#endif
#include <QDebug>
#include <QQmlError>
#include <cstdlib>
@@ -42,7 +44,7 @@ public:
private slots:
void initTestCase();
-#if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
+#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
void qmlMinify_data();
void qmlMinify();
#endif
@@ -166,7 +168,7 @@ Examples are any .qml files under the examples/ directory that start
with a lower case letter.
*/
-#if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
+#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
void tst_qmlmin::qmlMinify_data()
{
QTest::addColumn<QString>("file");
@@ -183,7 +185,7 @@ void tst_qmlmin::qmlMinify_data()
}
#endif
-#if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
+#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
void tst_qmlmin::qmlMinify()
{
QFETCH(QString, file);
diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
index 98b92e5fab..f2754d636b 100644
--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
@@ -29,7 +29,9 @@
#include "../../shared/util.h"
#include <QQmlApplicationEngine>
#include <QSignalSpy>
+#if QT_CONFIG(process)
#include <QProcess>
+#endif
#include <QDebug>
class tst_qqmlapplicationengine : public QQmlDataTest
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 1ca809c05f..ffb7fb5789 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -29,7 +29,6 @@
#include <qtest.h>
#include <QLibraryInfo>
#include <QDir>
-#include <QProcess>
#include <QDebug>
#include <QtQuick/QQuickItem>
#include <QtQuick/QQuickView>
diff --git a/tools/tools.pro b/tools/tools.pro
index a7fe0d983d..85556301a4 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -17,7 +17,7 @@ SUBDIRS += \
qmlscene \
qmltime
- qtConfig(regularexpression) {
+ qtConfig(regularexpression):qtConfig(process) {
SUBDIRS += \
qmlplugindump
}