summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-18 14:51:35 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-18 14:51:35 (GMT)
commit396eeb3f71c1c7edd861da1c8a8ec3086348502e (patch)
tree3ff6670ef4b192fd0993e0e9629e616570a6475a /configure
parente356eed2fa3d8e62085d6bd72caba9d11c40bacf (diff)
parent31ed96ef2c34429d61a5d9d1c1b7fe4fc17c708b (diff)
downloadQt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.zip
Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.gz
Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.bz2
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 0 insertions, 4 deletions
diff --git a/configure b/configure
index 6f0b6e7..e0b8b3e 100755
--- a/configure
+++ b/configure
@@ -7086,9 +7086,6 @@ 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
}
}
@@ -7173,7 +7170,6 @@ 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