Revert "turn qm generation into a build time target"

This reverts commit 1747ef43328fe79c5501328650b2a56f17b7a867.

46 files changed, 36 insertions, 48 deletions

diff --git a/projects.pro b/projects.pro
index 03ce098..2596c0a 100644
--- a/projects.pro
+++ b/projects.pro
@@ -37,10 +37,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
     } else:isEqual(PROJECT, docs) {
        contains(QT_BUILD_PARTS, tools):include(doc/doc.pri)
     } else:isEqual(PROJECT, translations) {
-       contains(QT_BUILD_PARTS, tools) {
-          include(translations/translations.pri)  # ts targets
-          SUBDIRS += translations                 # qm build step
-       }
+       contains(QT_BUILD_PARTS, tools):include(translations/translations.pri)
     } else:isEqual(PROJECT, qmake) {
 #      SUBDIRS += qmake
     } else {
diff --git a/translations/assistant_adp_de.qm b/translations/assistant_adp_de.qm
new file mode 100644
index 0000000..15ef713
--- /dev/null
+++ b/translations/assistant_adp_de.qm
diff --git a/translations/assistant_adp_ja.qm b/translations/assistant_adp_ja.qm
new file mode 100644
index 0000000..a3b4383
--- /dev/null
+++ b/translations/assistant_adp_ja.qm
diff --git a/translations/assistant_adp_pl.qm b/translations/assistant_adp_pl.qm
new file mode 100644
index 0000000..1b144e1
--- /dev/null
+++ b/translations/assistant_adp_pl.qm
diff --git a/translations/assistant_adp_zh_CN.qm b/translations/assistant_adp_zh_CN.qm
new file mode 100644
index 0000000..1685e47
--- /dev/null
+++ b/translations/assistant_adp_zh_CN.qm
diff --git a/translations/assistant_adp_zh_TW.qm b/translations/assistant_adp_zh_TW.qm
new file mode 100644
index 0000000..8e055c4
--- /dev/null
+++ b/translations/assistant_adp_zh_TW.qm
diff --git a/translations/assistant_de.qm b/translations/assistant_de.qm
new file mode 100644
index 0000000..5b31aea
--- /dev/null
+++ b/translations/assistant_de.qm
diff --git a/translations/assistant_pl.qm b/translations/assistant_pl.qm
new file mode 100644
index 0000000..14560b3
--- /dev/null
+++ b/translations/assistant_pl.qm
diff --git a/translations/assistant_zh_CN.qm b/translations/assistant_zh_CN.qm
new file mode 100644
index 0000000..22a770d
--- /dev/null
+++ b/translations/assistant_zh_CN.qm
diff --git a/translations/assistant_zh_TW.qm b/translations/assistant_zh_TW.qm
new file mode 100644
index 0000000..41f320e
--- /dev/null
+++ b/translations/assistant_zh_TW.qm
diff --git a/translations/designer_de.qm b/translations/designer_de.qm
new file mode 100644
index 0000000..f9b0a03
--- /dev/null
+++ b/translations/designer_de.qm
diff --git a/translations/designer_ja.qm b/translations/designer_ja.qm
new file mode 100644
index 0000000..6cf5f89
--- /dev/null
+++ b/translations/designer_ja.qm
diff --git a/translations/designer_pl.qm b/translations/designer_pl.qm
new file mode 100644
index 0000000..bf8d5f7
--- /dev/null
+++ b/translations/designer_pl.qm
diff --git a/translations/designer_zh_CN.qm b/translations/designer_zh_CN.qm
new file mode 100644
index 0000000..9267123
--- /dev/null
+++ b/translations/designer_zh_CN.qm
diff --git a/translations/designer_zh_TW.qm b/translations/designer_zh_TW.qm
new file mode 100644
index 0000000..fd6460d
--- /dev/null
+++ b/translations/designer_zh_TW.qm
diff --git a/translations/linguist_de.qm b/translations/linguist_de.qm
new file mode 100644
index 0000000..a39c3bf
--- /dev/null
+++ b/translations/linguist_de.qm
diff --git a/translations/linguist_ja.qm b/translations/linguist_ja.qm
new file mode 100644
index 0000000..cdb7c1c
--- /dev/null
+++ b/translations/linguist_ja.qm
diff --git a/translations/linguist_pl.qm b/translations/linguist_pl.qm
new file mode 100644
index 0000000..2604ffe
--- /dev/null
+++ b/translations/linguist_pl.qm
diff --git a/translations/linguist_zh_CN.qm b/translations/linguist_zh_CN.qm
new file mode 100644
index 0000000..d8081c5
--- /dev/null
+++ b/translations/linguist_zh_CN.qm
diff --git a/translations/linguist_zh_TW.qm b/translations/linguist_zh_TW.qm
new file mode 100644
index 0000000..9477e56
--- /dev/null
+++ b/translations/linguist_zh_TW.qm
diff --git a/translations/qt_ar.qm b/translations/qt_ar.qm
new file mode 100644
index 0000000..3d55bf4
--- /dev/null
+++ b/translations/qt_ar.qm
diff --git a/translations/qt_de.qm b/translations/qt_de.qm
new file mode 100644
index 0000000..9ea09a7
--- /dev/null
+++ b/translations/qt_de.qm
diff --git a/translations/qt_es.qm b/translations/qt_es.qm
new file mode 100644
index 0000000..0fa1226
--- /dev/null
+++ b/translations/qt_es.qm
diff --git a/translations/qt_fr.qm b/translations/qt_fr.qm
new file mode 100644
index 0000000..5553086
--- /dev/null
+++ b/translations/qt_fr.qm
diff --git a/translations/qt_help_de.qm b/translations/qt_help_de.qm
new file mode 100644
index 0000000..e3d8d87
--- /dev/null
+++ b/translations/qt_help_de.qm
diff --git a/translations/qt_help_pl.qm b/translations/qt_help_pl.qm
new file mode 100644
index 0000000..bf7fd10
--- /dev/null
+++ b/translations/qt_help_pl.qm
diff --git a/translations/qt_help_zh_CN.qm b/translations/qt_help_zh_CN.qm
new file mode 100644
index 0000000..11748b7
--- /dev/null
+++ b/translations/qt_help_zh_CN.qm
diff --git a/translations/qt_help_zh_TW.qm b/translations/qt_help_zh_TW.qm
new file mode 100644
index 0000000..b97aae4
--- /dev/null
+++ b/translations/qt_help_zh_TW.qm
diff --git a/translations/qt_iw.qm b/translations/qt_iw.qm
new file mode 100644
index 0000000..59c1c7e
--- /dev/null
+++ b/translations/qt_iw.qm
diff --git a/translations/qt_ja_JP.qm b/translations/qt_ja_JP.qm
new file mode 100644
index 0000000..b695c97
--- /dev/null
+++ b/translations/qt_ja_JP.qm
diff --git a/translations/qt_pl.qm b/translations/qt_pl.qm
new file mode 100644
index 0000000..f6847d0
--- /dev/null
+++ b/translations/qt_pl.qm
diff --git a/translations/qt_pt.qm b/translations/qt_pt.qm
new file mode 100644
index 0000000..253a007
--- /dev/null
+++ b/translations/qt_pt.qm
diff --git a/translations/qt_ru.qm b/translations/qt_ru.qm
new file mode 100644
index 0000000..63b7b8b
--- /dev/null
+++ b/translations/qt_ru.qm
diff --git a/translations/qt_sk.qm b/translations/qt_sk.qm
new file mode 100644
index 0000000..a73ddc6
--- /dev/null
+++ b/translations/qt_sk.qm
diff --git a/translations/qt_sv.qm b/translations/qt_sv.qm
new file mode 100644
index 0000000..6b1e9cf
--- /dev/null
+++ b/translations/qt_sv.qm
diff --git a/translations/qt_uk.qm b/translations/qt_uk.qm
new file mode 100644
index 0000000..7cd604a
--- /dev/null
+++ b/translations/qt_uk.qm
diff --git a/translations/qt_zh_CN.qm b/translations/qt_zh_CN.qm
new file mode 100644
index 0000000..e73b0cd
--- /dev/null
+++ b/translations/qt_zh_CN.qm
diff --git a/translations/qt_zh_TW.qm b/translations/qt_zh_TW.qm
new file mode 100644
index 0000000..699bd5c
--- /dev/null
+++ b/translations/qt_zh_TW.qm
diff --git a/translations/qtconfig_pl.qm b/translations/qtconfig_pl.qm
new file mode 100644
index 0000000..1a2faa3
--- /dev/null
+++ b/translations/qtconfig_pl.qm
diff --git a/translations/qtconfig_zh_CN.qm b/translations/qtconfig_zh_CN.qm
new file mode 100644
index 0000000..9998e81
--- /dev/null
+++ b/translations/qtconfig_zh_CN.qm
diff --git a/translations/qtconfig_zh_TW.qm b/translations/qtconfig_zh_TW.qm
new file mode 100644
index 0000000..3d36679
--- /dev/null
+++ b/translations/qtconfig_zh_TW.qm
diff --git a/translations/qvfb_pl.qm b/translations/qvfb_pl.qm
new file mode 100644
index 0000000..7230cb6
--- /dev/null
+++ b/translations/qvfb_pl.qm
diff --git a/translations/qvfb_zh_CN.qm b/translations/qvfb_zh_CN.qm
new file mode 100644
index 0000000..5592f07
--- /dev/null
+++ b/translations/qvfb_zh_CN.qm
diff --git a/translations/qvfb_zh_TW.qm b/translations/qvfb_zh_TW.qm
new file mode 100644
index 0000000..b378ad8
--- /dev/null
+++ b/translations/qvfb_zh_TW.qm
diff --git a/translations/translations.pri b/translations/translations.pri
index a7894c9..efefa09 100644
--- a/translations/translations.pri
+++ b/translations/translations.pri
@@ -8,8 +8,16 @@ defineReplace(prependAll) {
     return ($$result)
 }
 
-LUPDATE = $$QT_BUILD_TREE/bin/lupdate -locations relative -no-ui-lines
-win32:LUPDATE ~= s|/|\|g
+defineReplace(fixPath) {
+WIN {
+    return ($$replace($$1, /, \))
+} ELSE {
+    return ($$1)
+}
+}
+
+LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate) -locations relative -no-ui-lines
+LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease)
 
 ###### Qt Libraries
 
@@ -33,18 +41,27 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                 -ts $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts))
 ts-qt.depends = sub-tools
 
+qm-qt.commands = $$LRELEASE $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts)
+qm-qt.depends = sub-tools
+
 ###### Designer
 
 ts-designer.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                     ../tools/designer/translations/translations.pro)
 ts-designer.depends = sub-tools
 
+qm-designer.commands = $$LRELEASE $$QT_SOURCE_TREE/tools/designer/translations/translations.pro
+qm-designer.depends = sub-tools
+
 ###### Linguist
 
 ts-linguist.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                     ../tools/linguist/linguist/linguist.pro)
 ts-linguist.depends = sub-tools
 
+qm-linguist.commands = $$LRELEASE $$QT_SOURCE_TREE/tools/linguist/linguist/linguist.pro
+qm-linguist.depends = sub-tools
+
 ###### Assistant
 
 ts-assistant.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
@@ -55,21 +72,36 @@ ts-assistant.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                     ../tools/assistant/translations/translations_adp.pro)
 ts-assistant.depends = sub-tools
 
+qm-assistant.commands = ($$LRELEASE $$QT_SOURCE_TREE/tools/assistant/translations/translations.pro \
+                         && $$LRELEASE \
+                            $$QT_SOURCE_TREE/tools/assistant/translations/qt_help.pro \
+                         && $$LRELEASE \
+                            $$QT_SOURCE_TREE/tools/assistant/translations/translations_adp.pro)
+qm-assistant.depends = sub-tools
+
 ###### Qtconfig
 
 ts-qtconfig.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                     ../tools/qtconfig/translations/translations.pro)
 ts-qtconfig.depends = sub-tools
 
+qm-qtconfig.commands = $$LRELEASE $$QT_SOURCE_TREE/tools/qtconfig/translations/translations.pro
+qm-qtconfig.depends = sub-tools
+
 ###### Qvfp
 
 ts-qvfb.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                     ../tools/qvfb/translations/translations.pro)
 ts-qvfb.depends = sub-tools
 
+qm-qvfb.commands = $$LRELEASE $$QT_SOURCE_TREE/tools/qvfb/translations/translations.pro
+qm-qvfb.depends = sub-tools
+
 ###### Overall Rules
 
 ts.depends = ts-qt ts-designer ts-linguist ts-assistant ts-qtconfig ts-qvfb
+qm.depends = qm-qt qm-designer qm-linguist qm-assistant qm-qtconfig qm-qvfb
 
 QMAKE_EXTRA_TARGETS += ts-qt ts-designer ts-linguist ts-assistant ts-qtconfig ts-qvfb \
-                       ts
+                       qm-qt qm-designer qm-linguist qm-assistant qm-qtconfig qm-qvfb \
+                       ts qm
diff --git a/translations/translations.pro b/translations/translations.pro
deleted file mode 100644
index d1962fe..0000000
--- a/translations/translations.pro
+++ /dev/null
@@ -1,41 +0,0 @@
-TRANSLATIONS = $$files(*.ts)
-
-LRELEASE = $$QT_BUILD_TREE/bin/lrelease
-win32:LRELEASE ~= s|/|\|g
-
-contains(TEMPLATE_PREFIX, vc):vcproj = 1
-
-TEMPLATE = app
-TARGET = qm_phony_target
-CONFIG -= qt separate_debug_info
-QT =
-LIBS =
-
-updateqm.input = TRANSLATIONS
-updateqm.output = ${QMAKE_FILE_BASE}.qm
-isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
-updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
-updateqm.name = LRELEASE ${QMAKE_FILE_IN}
-updateqm.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += updateqm
-
-isEmpty(vcproj) {
-    QMAKE_LINK = @: IGNORE THIS LINE
-    OBJECTS_DIR =
-    win32:CONFIG -= embed_manifest_exe
-} else {
-    CONFIG += console
-    PHONY_DEPS = .
-    phony_src.input = PHONY_DEPS
-    phony_src.output = phony.c
-    phony_src.variable_out = GENERATED_SOURCES
-    phony_src.commands = echo int main() { return 0; } > phony.c
-    phony_src.name = CREATE phony.c
-    phony_src.CONFIG += combine
-    QMAKE_EXTRA_COMPILERS += phony_src
-}
-
-translations.path = $$[QT_INSTALL_TRANSLATIONS]
-translations.files = $$TRANSLATIONS
-translations.files ~= s,\\.ts$,.qm,g
-INSTALLS += translations