fix ts and qm targets for shadow builds and builds with -prefix

8 files changed, 58 insertions, 44 deletions

diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
index 7d92d06..69570d3 100644
--- a/tools/assistant/translations/qt_help.pro
+++ b/tools/assistant/translations/qt_help.pro
@@ -39,12 +39,14 @@ HEADERS += ../lib/qhelpcollectionhandler_p.h \
            ../lib/qhelp_global.h
 
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_da.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/qt_help_da.ts \
+    $$TR_DIR/qt_help_de.ts
+    $$TR_DIR/qt_help_ja.ts \
+    $$TR_DIR/qt_help_pl.ts \
+    $$TR_DIR/qt_help_ru.ts \
+    $$TR_DIR/qt_help_zh_CN.ts \
+    $$TR_DIR/qt_help_zh_TW.ts
 
 error("This is a dummy profile to be used for translations ONLY.")
diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro
index b3dbd10..6ff1fc9 100644
--- a/tools/assistant/translations/translations.pro
+++ b/tools/assistant/translations/translations.pro
@@ -40,10 +40,12 @@ HEADERS += ../tools/assistant/aboutdialog.h \
            ../tools/assistant/searchwidget.h \
            ../tools/assistant/topicchooser.h \
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_da.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/assistant_da.ts \
+    $$TR_DIR/assistant_de.ts \
+    $$TR_DIR/assistant_ja.ts \
+    $$TR_DIR/assistant_pl.ts \
+    $$TR_DIR/assistant_ru.ts \
+    $$TR_DIR/assistant_zh_CN.ts \
+    $$TR_DIR/assistant_zh_TW.ts
diff --git a/tools/assistant/translations/translations_adp.pro b/tools/assistant/translations/translations_adp.pro
index 4ff6576..852bdeb 100644
--- a/tools/assistant/translations/translations_adp.pro
+++ b/tools/assistant/translations/translations_adp.pro
@@ -31,11 +31,13 @@ HEADERS += ../compat/helpwindow.h \
            ../compat/fontsettingsdialog.h
 
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/assistant_adp_de.ts \
+    $$TR_DIR/assistant_adp_ja.ts \
+    $$TR_DIR/assistant_adp_pl.ts \
+    $$TR_DIR/assistant_adp_ru.ts \
+    $$TR_DIR/assistant_adp_zh_CN.ts \
+    $$TR_DIR/assistant_adp_zh_TW.ts
 
 error("This is a dummy profile to be used for translations ONLY.")
diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro
index 96d9074..a37918c 100644
--- a/tools/designer/translations/translations.pro
+++ b/tools/designer/translations/translations.pro
@@ -130,10 +130,12 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \
            ../../shared/findwidget/itemviewfindwidget.h \
            ../../shared/findwidget/texteditfindwidget.h
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_sl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/designer_de.ts \
+    $$TR_DIR/designer_ja.ts \
+    $$TR_DIR/designer_pl.ts \
+    $$TR_DIR/designer_ru.ts \
+    $$TR_DIR/designer_sl.ts \
+    $$TR_DIR/designer_zh_CN.ts \
+    $$TR_DIR/designer_zh_TW.ts
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index c7f6f1c..c902aeb 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -95,10 +95,12 @@ FORMS += statistics.ui \
     finddialog.ui
 RESOURCES += linguist.qrc
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_fr.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/linguist_de.ts \
+    $$TR_DIR/linguist_fr.ts \
+    $$TR_DIR/linguist_ja.ts \
+    $$TR_DIR/linguist_pl.ts \
+    $$TR_DIR/linguist_ru.ts \
+    $$TR_DIR/linguist_zh_CN.ts \
+    $$TR_DIR/linguist_zh_TW.ts
diff --git a/tools/qtconfig/translations/translations.pro b/tools/qtconfig/translations/translations.pro
index 51e96f0..bf8a1da 100644
--- a/tools/qtconfig/translations/translations.pro
+++ b/tools/qtconfig/translations/translations.pro
@@ -7,7 +7,9 @@ HEADERS        += ../colorbutton.h ../previewframe.h ../previewwidget.h ../mainw
 
 FORMS        = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/qtconfig_pl.ts \
+    $$TR_DIR/qtconfig_ru.ts \
+    $$TR_DIR/qtconfig_zh_CN.ts \
+    $$TR_DIR/qtconfig_zh_TW.ts
diff --git a/tools/qvfb/translations/translations.pro b/tools/qvfb/translations/translations.pro
index 2f37b0e..ef42063 100644
--- a/tools/qvfb/translations/translations.pro
+++ b/tools/qvfb/translations/translations.pro
@@ -26,7 +26,9 @@ SOURCES =  ../qvfb.cpp \
            ../../../src/gui/embedded/qwssignalhandler.cpp \
            ../../shared/deviceskin/deviceskin.cpp
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qvfb_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/qvfb_pl.ts \
+    $$TR_DIR/qvfb_ru.ts \
+    $$TR_DIR/qvfb_zh_CN.ts \
+    $$TR_DIR/qvfb_zh_TW.ts
diff --git a/translations/translations.pri b/translations/translations.pri
index f984e39..b7924cd 100644
--- a/translations/translations.pri
+++ b/translations/translations.pri
@@ -41,10 +41,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
                                     svg \
                                     xml \
                                     xmlpatterns \
-                                -ts $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts))
+                                -ts $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts))
 ts-qt.depends = sub-tools
 
-qm-qt.commands = $$LRELEASE $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts)
+qm-qt.commands = $$LRELEASE $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts)
 qm-qt.depends = sub-tools
 
 ###### Designer