feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix exclusion of qbs from tr()-collection

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2014-12-17 14:24:43 +01:00
parent 6e2782b8b0
commit 10e6c40e16
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/translations/translations.pro
View File

@@ -58,7 +58,11 @@ plugin_sources -= src/plugins/plugins.pro \
src/plugins/qtestlib \ src/plugins/qtestlib \
src/plugins/snippets \ src/plugins/snippets \
src/plugins/regexp 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 share/qtcreator/welcomescreen share/qtcreator/welcomescreen/widgets
files = $$files($$PWD/*_??.ts) $$PWD/qtcreator_untranslated.ts files = $$files($$PWD/*_??.ts) $$PWD/qtcreator_untranslated.ts

2
src/src.pro
View File

@@ -22,7 +22,7 @@ exists(shared/qbs/qbs.pro) {
isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS
} }
TR_EXCLUDE = $$QBS_DIRS TR_EXCLUDE = shared/qbs
SUBDIRS += \ SUBDIRS += \
libs \ libs \