AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't exclude QtCore from dependencies when generating modules

Browse Source 
and plugins.

src/network/network.pro for instance depends on core-private, but
because we ignore adding QtCore as a public dependency, the exported
Config file for Network doesn't depend on QtCore anymore, so if a user
only links against Network, they won't automatically link against
Core.

Change-Id: I4a60ffae7e071927360b8ccf6b1b7479ab391060
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alexandru Croitor 2019-05-17 17:41:59 +02:00
parent e0a6e9f3aa
commit c454e622a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/cmake/pro2cmake.py
View File

@ -1482,7 +1482,7 @@ def write_module(cm_fh: typing.IO[str], scope: Scope, *,
write_main_part(cm_fh, module_name[2:], 'Module', 'add_qt_module', scope,
extra_lines=extra, indent=indent,
known_libraries={'Qt::Core', }, extra_keys=[])
known_libraries={}, extra_keys=[])
if 'qt_tracepoints' in scope.get('CONFIG'):
tracepoints = scope.get_files('TRACEPOINT_PROVIDER')
@ -1596,7 +1596,7 @@ def write_plugin(cm_fh, scope, *, indent: int = 0):
assert plugin_name
write_main_part(cm_fh, plugin_name, 'Plugin', 'add_qt_plugin', scope,
indent=indent, known_libraries={'QtCore', }, extra_keys=[])
indent=indent, known_libraries={}, extra_keys=[])
def handle_app_or_lib(scope: Scope, cm_fh: typing.IO[str], *,