1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pro2cmake.py: Do not try to add libraries that qmake substracts

Browse Source 
Add a comment that a library was removed when running into "QT -= gui"
and similar lines.

Change-Id: I17b7922827f228c6b45e1e6867fdc5e316af3781
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tobias Hunger 2018-11-02 12:32:57 +01:00 committed by Tobias Hunger
parent cda5d06bd8
commit 4769830034
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/cmake/pro2cmake.py
View File

@ -522,7 +522,11 @@ def write_sources_section(cm_fh: IO[str], scope: Scope, *, indent: int=0,
d = '${FW%s}' % d d = '${FW%s}' % d
if d.startswith('-l'): if d.startswith('-l'):
d = d[2:] d = d[2:]
d = substitute_libs(d)
if d.startswith('-'):
d = '# Remove: {}'.format(d[1:])
else:
d = substitute_libs(d)
cm_fh.write('{} {}\n'.format(ind, d)) cm_fh.write('{} {}\n'.format(ind, d))
is_framework = False is_framework = False