From 10e6c40e1609ab8de58fc35cc3c4ef0a74ab83f5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 17 Dec 2014 14:24:43 +0100
Subject: [PATCH] fix exclusion of qbs from tr()-collection
note that the TR_EXCLUDE is actually not used currently.
Change-Id: Ifc89587029e2c025d1e0253794668a515127a43f
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
share/qtcreator/translations/translations.pro | 6 +++++-
src/src.pro | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
index ed8cc97062d..4892af5f7ec 100644
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
@@ -58,7 +58,11 @@ plugin_sources -= src/plugins/plugins.pro \
src/plugins/qtestlib \
src/plugins/snippets \
src/plugins/regexp
-sources = src/app src/libs $$plugin_sources src/shared share/qtcreator/qmldesigner \
+shared_sources = $$files($$IDE_SOURCE_TREE/src/shared/*)
+shared_sources ~= s,^$$re_escape($$IDE_SOURCE_TREE/),,g$$i_flag
+shared_sources -= \
+ src/shared/qbs
+sources = src/app src/libs $$plugin_sources $$shared_sources share/qtcreator/qmldesigner \
share/qtcreator/welcomescreen share/qtcreator/welcomescreen/widgets
files = $$files($$PWD/*_??.ts) $$PWD/qtcreator_untranslated.ts
diff --git a/src/src.pro b/src/src.pro
index f64dc048218..ea996ee839d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -22,7 +22,7 @@ exists(shared/qbs/qbs.pro) {
isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS
}
-TR_EXCLUDE = $$QBS_DIRS
+TR_EXCLUDE = shared/qbs
SUBDIRS += \
libs \
--
GitLab