diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 09:50:43 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-13 15:55:44 +0100 |
| commit | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (patch) | |
| tree | 023a1ecaa944152e08ba11291ec7aadc12f59dad /src/testlib | |
| parent | f06f1adb6cc3835793a15eafa2d5a3affad712a2 (diff) | |
| parent | 3a1f4b186d8ce79717da37f808ff9a4b3e949d9c (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
examples/network/network.pro
mkspecs/features/mac/default_post.prf
src/corelib/io/qfilesystemengine_win.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess.h
src/corelib/io/qprocess_p.h
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/corelib/thread/qmutex.cpp
src/platformsupport/fontdatabases/windows/windows.pri
src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
tests/auto/corelib/io/io.pro
Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qbenchmark.cpp | 1 | ||||
| -rw-r--r-- | src/testlib/qbenchmark_p.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index c933a16c35..d49d07bb70 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -42,7 +42,6 @@ #include <QtTest/private/qbenchmarkmetric_p.h> #include <QtTest/private/qbenchmarktimemeasurers_p.h> -#include <QtCore/qprocess.h> #include <QtCore/qdir.h> #include <QtCore/qset.h> #include <QtCore/qdebug.h> diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h index 797071d7a4..dbfa0127b6 100644 --- a/src/testlib/qbenchmark_p.h +++ b/src/testlib/qbenchmark_p.h @@ -55,7 +55,7 @@ #include <QtCore/qglobal.h> -#if (defined(Q_OS_LINUX) || defined Q_OS_MAC) && !defined(QT_NO_PROCESS) +#if (defined(Q_OS_LINUX) || defined Q_OS_MACOS) && QT_CONFIG(process) #define QTESTLIB_USE_VALGRIND #else #undef QTESTLIB_USE_VALGRIND diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 19d135e15f..2a6cad698f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -51,7 +51,6 @@ #include <QtCore/qfile.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> -#include <QtCore/qprocess.h> #include <QtCore/qdebug.h> #include <QtCore/qlibraryinfo.h> #include <QtCore/private/qtools_p.h> |