diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-09-24 08:26:30 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-10-13 13:32:36 +0000 |
| commit | 5fa64386336b3072a12054726483e4850fc53dea (patch) | |
| tree | 1e813c55a1e3d07549cfe2dd6fe3a927c3677c19 /mkspecs/features/qt_functions.prf | |
| parent | bc74273143dfb5de8e2255649c7fd037d3d4075a (diff) | |
Qmake: Introduce and use QMAKE_{SYSTEM,SHELL}_NULL_DEVICE variable, take 2
SYSTEM is used for system() calls, while SHELL is used in the target
Makefiles.
Task-number: QTBUG-62985
Change-Id: Ia75d3939c59c98699359421166433e8b4a6ee35e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index c00fdb73f8..1903e509c8 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -291,10 +291,7 @@ defineReplace(pkgConfigExecutable) { } } - equals(QMAKE_HOST.os, Windows): \ - PKG_CONFIG += 2> NUL - else: \ - PKG_CONFIG += 2> /dev/null + PKG_CONFIG += 2> $$QMAKE_SYSTEM_NULL_DEVICE return($$PKG_CONFIG) } |