diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
| commit | 4545c81e570c477ae8821531dcfd593e09f950b0 (patch) | |
| tree | f756738ffaf55210a2aa1596407eeed94e504ae7 /scripts | |
| parent | d0839bc1de52acd0902364565b6f9d030e591646 (diff) | |
| parent | 75e408584ac9a60c3a4dd714f5620814485fcdca (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
doc/src/howto/creator-sidebar-views.qdoc
doc/src/howto/creator-ui.qdoc
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/autotest/testresultmodel.cpp
src/plugins/autotest/testresultmodel.h
Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/createSourcePackages.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/createSourcePackages.py b/scripts/createSourcePackages.py index 1385de943a..1e1bdead92 100755 --- a/scripts/createSourcePackages.py +++ b/scripts/createSourcePackages.py @@ -99,9 +99,9 @@ def main(): args = parse_arguments() base_repo_name = args.name if args.name else "qtcreator" if not args.name and not args.modules: # default Qt Creator repository - qbs_path = os.path.join('src', 'shared', 'qbs') - if os.path.exists(os.path.join(args.repo, qbs_path)): - args.modules = [qbs_path] + submodules = [os.path.join('src', 'shared', 'qbs'), + os.path.join('src', 'tools', 'perfparser')] + args.modules = [path for path in submodules if os.path.exists(os.path.join(args.repo, path, '.git'))] repos = [(base_repo_name, args.repo, '')] for module in args.modules: repos += [(module, os.path.join(args.repo, module), module + os.sep)] |