fix -fast flag when used in combination with stub mode

This commit is contained in:
therecipe 2017-04-11 21:24:26 +02:00
parent bc5bdbc293
commit 91ffc25c1b
2 changed files with 5 additions and 2 deletions

View file

@ -16,7 +16,7 @@ import (
func build(mode, target, path, ldFlagsCustom, name, depPath string, fast bool) {
env, tags, ldFlags, out := cmd.BuildEnv(target, name, depPath)
if !fast {
if !fast || utils.QT_STUB() {
tags = append(tags, "minimal")
}
if ldFlagsCustom != "" {

View file

@ -40,10 +40,13 @@ func Deploy(mode, target, path string, docker bool, ldFlags string, fast bool) {
rcc.Rcc(path, target, os.Getenv("QTRCC_OUTPUT_DIR"))
if !fast {
moc.Moc(path, target, false)
}
if !fast || utils.QT_STUB() {
minimal.Minimal(path, target)
}
build(mode, target, path, ldFlags, name, depPath, fast && !utils.QT_STUB())
build(mode, target, path, ldFlags, name, depPath, fast)
if !fast {
bundle(mode, target, path, name, depPath)