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)

3 files changed, 12 insertions, 1 deletions

diff --git a/configure b/configure
index ece117ba51..5a162ee7a3 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 03ce0984e3..fc531009db 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 60d86b8e1a..128e578c30 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")