summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-12 18:49:24 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-06-15 09:39:47 (GMT)
commite75ef82bc4570c0a6da3da26a1dda5d6e065f23b (patch)
treee529def547683666618fd7f9cc86f81f4a87f9de /configure
parentce20a20f33a02f8e716ffe5a675115d7677da462 (diff)
downloadQt-e75ef82bc4570c0a6da3da26a1dda5d6e065f23b.zip
Qt-e75ef82bc4570c0a6da3da26a1dda5d6e065f23b.tar.gz
Qt-e75ef82bc4570c0a6da3da26a1dda5d6e065f23b.tar.bz2
fix qm build
so "qmake -r && make" worked fine ... but configure does not simply run "qmake -r". also, now we have to build lrelease even when we don't build the other tools. Reviewed-by: Jason McDonald Reviewed-by: mariusSO (cherry picked from commit 98899a4122565090640672d9aae2c37315f186ce)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index ece117b..5a162ee 100755
--- a/configure
+++ b/configure
@@ -7050,6 +7050,9 @@ FNR == 1 {
if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
target_file = first
matched_target = 1
+ } else if ( \$3 == "lrelease" || \$3 == "qm_phony_target" ) {
+ target_file = second
+ matched_target = 1
}
}
@@ -7134,6 +7137,7 @@ for part in $CFG_BUILD_PARTS; do
case "$part" in
tools) PART_ROOTS="$PART_ROOTS tools" ;;
libs) PART_ROOTS="$PART_ROOTS src" ;;
+ translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
*) ;;
esac