Merge #12740: multiple outputs for Qt 5 and KDE 5

This commit is contained in:
Vladimír Čunát
2016-02-03 17:09:09 +01:00
78 changed files with 733 additions and 417 deletions
@@ -13,7 +13,7 @@ fixCmakeFiles() {
}
cmakeConfigurePhase() {
eval "$preConfigure"
runHook preConfigure
if [ -z "$dontFixCmake" ]; then
fixCmakeFiles .
@@ -53,10 +53,11 @@ cmakeConfigurePhase() {
cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"
eval "$postConfigure"
runHook postConfigure
}
if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then
setOutputFlags=
configurePhase=cmakeConfigurePhase
fi