diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-24 10:37:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 13:40:55 +0200 |
| commit | fa9d12f4a20d618caedc77880459fa1af75fd50d (patch) | |
| tree | 11bd3cb4541afb924b3ee17f867133e71eb0e090 /mkspecs/features/ctest_testcase_common.prf | |
| parent | 895cb4681ee78caaf9b99c88390a74ff1d79ae61 (diff) | |
| parent | f174d31667dca184439f520b9624a1471d9556a6 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/plugins/platforms/xcb/qxcbimage.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/manual/qtabletevent/regular_widgets/main.cpp
Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30
Diffstat (limited to 'mkspecs/features/ctest_testcase_common.prf')
| -rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index f5eafc4e0d..1e3f9d2c1c 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -1,10 +1,5 @@ -win32 { - cmake_version_output = $$system(cmake --version 2>NUL, lines) -} else { - cmake_version_output = $$system(cmake --version 2>/dev/null, lines) -} - +cmake_version_output = $$system(cmake --version 2>$$QMAKE_SYSTEM_NULL_DEVICE, lines) # First line cmake_version_output = $$first(cmake_version_output) # Format is "cmake version X.Y.Z" @@ -19,12 +14,7 @@ isEmpty(CMAKE_VERSION) { return() } -win32 { - CTEST_VERSION = $$system(ctest --version 2>NUL) -} else { - CTEST_VERSION = $$system(ctest --version 2>/dev/null) -} - +CTEST_VERSION = $$system(ctest --version 2>$$QMAKE_SYSTEM_NULL_DEVICE) isEmpty(CTEST_VERSION) { message("ctest executable not found. Not running CMake unit tests") return() |