diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-10-02 09:23:31 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-10-02 08:43:38 +0000 |
| commit | ec16ba393baf504d4b192cc349775c62d3c96aa0 (patch) | |
| tree | d2e00f15382ecec5c4737efc233a503e7d38d22d /mkspecs/features/qt_functions.prf | |
| parent | 8883e44eca057dce04e94bce50d41c472e4e8f00 (diff) | |
Revert "Qmake: Introduce and use QMAKE_NULL_DEVICE variable"v5.9.2
With that change QNX7 builds in windows will fail.
This reverts commit b4e9cb4c29ef797fe535a84717bebf81fbdc61e4.
Task-number: QTBUG-63535
Change-Id: Ia91d173803af62d41d1a7e5832bab911920f590d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1f44650227..c00fdb73f8 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -291,7 +291,10 @@ defineReplace(pkgConfigExecutable) { } } - PKG_CONFIG += 2> $$QMAKE_NULL_DEVICE + equals(QMAKE_HOST.os, Windows): \ + PKG_CONFIG += 2> NUL + else: \ + PKG_CONFIG += 2> /dev/null return($$PKG_CONFIG) } |