diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/dbuscommon.pri | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/dbuscommon.pri b/mkspecs/features/dbuscommon.pri index 4608fb6ca2..6e1e5659c3 100644 --- a/mkspecs/features/dbuscommon.pri +++ b/mkspecs/features/dbuscommon.pri @@ -72,7 +72,7 @@ for(group, groups) { $${group}_moc.output = $$moc_header.output $${group}_moc.input = $${GROUP}_HEADERS $${group}_moc.variable_out = GENERATED_SOURCES - $${group}_moc.name = $$moc_header.name + $${group}_moc.name = $${GROUP}_$$moc_header.name QMAKE_EXTRA_COMPILERS += $${group}_header $${group}_source $${group}_moc } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f055be72a8..c8d151ce4d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -303,6 +303,11 @@ defineReplace(pkgConfigExecutable) { } } + equals(QMAKE_HOST.os, Windows): \ + PKG_CONFIG += 2> NUL + else: \ + PKG_CONFIG += 2> /dev/null + return($$PKG_CONFIG) } |