diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-07 16:21:30 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 18:02:42 +0200 |
commit | bc2666d9162c74f1f31e05596c903c590cfa6bba (patch) | |
tree | b0195990739cfa2e0e62251103386b638f88d1c4 /mkspecs | |
parent | ca513feb039262714e204be5174c6ed68b66b70d (diff) |
suppress error output from pkg-config
under normal circumstances, any errors will be noticed already by the
pkg-config --exists call, which is silent anyway. therefore this doesn't
change anything in normal qmake usage.
however, lupdate's and creator's evaluators skip the --exists calls and
subsequently invoke the normal query, which then prints useless noise to
the terminal.
Task-number: QTBUG-28159
Change-Id: I536412060f3830aafeb0587f855cd6af11227bca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 2f2c94ce06..07821fd09b 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -304,6 +304,11 @@ defineReplace(pkgConfigExecutable) { } } + equals(QMAKE_HOST.os, Windows): \ + PKG_CONFIG += 2> NUL + else: \ + PKG_CONFIG += 2> /dev/null + return($$PKG_CONFIG) } |