Fix whitespace issues in *.prf
Replaced tabs with spaces to align with space-indented code and removed some trailing whitespace. Change-Id: I4930afc3df206ef8ee96de3e69f0d69fc4a1c77c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
0c645f1345
commit
1622dca213
@ -33,15 +33,15 @@ defineTest(addExclusiveBuilds) {
|
||||
|
||||
contains(TEMPLATE, subdirs) {
|
||||
eval(sub_$${firstBuildName}.target = $$firstBuild)
|
||||
export(sub_$${firstBuildName}.target)
|
||||
export(sub_$${firstBuildName}.target)
|
||||
eval(sub_$${firstBuildName}.CONFIG = recursive)
|
||||
export(sub_$${firstBuildName}.CONFIG)
|
||||
export(sub_$${firstBuildName}.CONFIG)
|
||||
eval(sub_$${secondBuildName}.target = $$secondBuild)
|
||||
export(sub_$${secondBuildName}.target)
|
||||
export(sub_$${secondBuildName}.target)
|
||||
eval(sub_$${secondBuildName}.CONFIG = recursive)
|
||||
export(sub_$${secondBuildName}.CONFIG)
|
||||
QMAKE_EXTRA_TARGETS += sub_$${firstBuildName} sub_$${secondBuildName}
|
||||
export(QMAKE_EXTRA_TARGETS)
|
||||
export(sub_$${secondBuildName}.CONFIG)
|
||||
QMAKE_EXTRA_TARGETS += sub_$${firstBuildName} sub_$${secondBuildName}
|
||||
export(QMAKE_EXTRA_TARGETS)
|
||||
} else:!build_pass {
|
||||
first_BUILDS =
|
||||
second_BUILDS =
|
||||
@ -56,32 +56,32 @@ defineTest(addExclusiveBuilds) {
|
||||
else: permutationName = -$$permutation
|
||||
# Makefile target rule
|
||||
eval($${firstBuildName}$${permutation}.target = $${firstBuild}$$lower($${permutationName}))
|
||||
export($${firstBuildName}$${permutation}.target)
|
||||
export($${firstBuildName}$${permutation}.target)
|
||||
# IDE name
|
||||
eval($${firstBuildName}$${permutation}.name = $${firstBuildName}$${permutationName})
|
||||
export($${firstBuildName}$${permutation}.name)
|
||||
# prl import CONFIG option
|
||||
export($${firstBuildName}$${permutation}.name)
|
||||
# prl import CONFIG option
|
||||
eval($${firstBuildName}$${permutation}.PRL_CONFIG = $${firstBuild}$${permutation})
|
||||
export($${firstBuildName}$${permutation}.PRL_CONFIG)
|
||||
# Individual CONFIG option
|
||||
eval($${firstBuildName}$${permutation}.CONFIG = $${firstBuild} $${firstBuildName}Build $$eval($${permutation}.CONFIG))
|
||||
export($${firstBuildName}$${permutation}.CONFIG)
|
||||
export($${firstBuildName}$${permutation}.CONFIG)
|
||||
|
||||
eval($${secondBuildName}$${permutation}.target = $${secondBuild}$$lower($${permutationName}))
|
||||
export($${secondBuildName}$${permutation}.target)
|
||||
export($${secondBuildName}$${permutation}.target)
|
||||
eval($${secondBuildName}$${permutation}.name = $${secondBuildName}$${permutationName})
|
||||
export($${secondBuildName}$${permutation}.name)
|
||||
eval($${secondBuildName}$${permutation}.PRL_CONFIG = $${secondBuild}$${permutation})
|
||||
export($${secondBuildName}$${permutation}.PRL_CONFIG)
|
||||
export($${secondBuildName}$${permutation}.name)
|
||||
eval($${secondBuildName}$${permutation}.PRL_CONFIG = $${secondBuild}$${permutation})
|
||||
export($${secondBuildName}$${permutation}.PRL_CONFIG)
|
||||
eval($${secondBuildName}$${permutation}.CONFIG = $${secondBuild} $${secondBuildName}Build $$eval($${permutation}.CONFIG))
|
||||
export($${secondBuildName}$${permutation}.CONFIG)
|
||||
|
||||
export($${secondBuildName}$${permutation}.CONFIG)
|
||||
|
||||
first_BUILDS += $${firstBuildName}$${permutation}
|
||||
second_BUILDS += $${secondBuildName}$${permutation}
|
||||
}
|
||||
|
||||
|
||||
# A mutual exclusive block.
|
||||
CONFIG($${firstBuild}, $${firstBuild}|$${secondBuild}): BUILDS = $$first_BUILDS $$second_BUILDS
|
||||
CONFIG($${firstBuild}, $${firstBuild}|$${secondBuild}): BUILDS = $$first_BUILDS $$second_BUILDS
|
||||
else: BUILDS = $$second_BUILDS $$first_BUILDS
|
||||
export(BUILDS)
|
||||
} else {
|
||||
|
@ -4,7 +4,7 @@ load(default_post)
|
||||
# Pick a suitable default architecture for qmake-based applications.
|
||||
# If the Qt package contains one of x86 and x86_64, pick that one. If it
|
||||
# contains both then use the compiler default. Make a similiar decision for
|
||||
# PowerPC-based systems. Note that this logic assumes that Qt has been
|
||||
# PowerPC-based systems. Note that this logic assumes that Qt has been
|
||||
# configured with an architecture that is usable on the system.
|
||||
qt:!isEmpty(QT_CONFIG) {
|
||||
contains(QMAKE_HOST.arch, ppc)|contains(QMAKE_HOST.arch, "Power Macintosh") {
|
||||
|
@ -60,7 +60,7 @@ moc_header.input = HEADERS
|
||||
moc_header.variable_out = SOURCES
|
||||
moc_header.name = MOC ${QMAKE_FILE_IN}
|
||||
!contains(TEMPLATE, "vc.*") {
|
||||
!isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP
|
||||
!isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP
|
||||
}
|
||||
silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands
|
||||
QMAKE_EXTRA_COMPILERS += moc_header
|
||||
@ -74,7 +74,7 @@ moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EX
|
||||
moc_source.input = SOURCES OBJECTIVE_SOURCES
|
||||
moc_source.name = MOC ${QMAKE_FILE_IN}
|
||||
!contains(TEMPLATE, "vc.*") {
|
||||
!isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP
|
||||
!isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP
|
||||
}
|
||||
silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands
|
||||
QMAKE_EXTRA_COMPILERS += moc_source
|
||||
|
Loading…
Reference in New Issue
Block a user