summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-12 18:49:24 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-15 09:14:48 (GMT)
commit98899a4122565090640672d9aae2c37315f186ce (patch)
treede82134a9eba978a2090568e0b472c355fd3d621
parentb3743d1df735d4b46f45e034818bbfe45bf8d22e (diff)
downloadQt-98899a4122565090640672d9aae2c37315f186ce.zip
Qt-98899a4122565090640672d9aae2c37315f186ce.tar.gz
Qt-98899a4122565090640672d9aae2c37315f186ce.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
-rwxr-xr-xconfigure4
-rw-r--r--projects.pro8
-rw-r--r--tools/configure/configureapp.cpp1
3 files changed, 12 insertions, 1 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
diff --git a/projects.pro b/projects.pro
index 03ce098..fc53100 100644
--- a/projects.pro
+++ b/projects.pro
@@ -10,6 +10,10 @@ cross_compile: CONFIG += nostrip
isEmpty(QT_BUILD_PARTS) { #defaults
QT_BUILD_PARTS = libs tools examples demos docs translations
} else { #make sure the order makes sense
+ contains(QT_BUILD_PARTS, translations) {
+ QT_BUILD_PARTS -= translations
+ QT_BUILD_PARTS = translations $$QT_BUILD_PARTS
+ }
contains(QT_BUILD_PARTS, tools) {
QT_BUILD_PARTS -= tools
QT_BUILD_PARTS = tools $$QT_BUILD_PARTS
@@ -39,8 +43,10 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
} else:isEqual(PROJECT, translations) {
contains(QT_BUILD_PARTS, tools) {
include(translations/translations.pri) # ts targets
- SUBDIRS += translations # qm build step
+ } else {
+ SUBDIRS += tools/linguist/lrelease
}
+ SUBDIRS += translations # qm build step
} else:isEqual(PROJECT, qmake) {
# SUBDIRS += qmake
} else {
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b9d172f..00a93c1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3142,6 +3142,7 @@ void Configure::buildHostTools()
<< "src/tools/moc"
<< "src/tools/rcc"
<< "src/tools/uic"
+ << "tools/linguist/lrelease"
<< "tools/checksdk";
if (dictionary[ "CETEST" ] == "yes")