Commit 10e6c40e authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

fix exclusion of qbs from tr()-collection

note that the TR_EXCLUDE is actually not used currently.

Change-Id: Ifc89587029e2c025d1e0253794668a515127a43f
Reviewed-by: default avatarRobert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent 6e2782b8
...@@ -58,7 +58,11 @@ plugin_sources -= src/plugins/plugins.pro \ ...@@ -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
......
...@@ -22,7 +22,7 @@ exists(shared/qbs/qbs.pro) { ...@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment