diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-01-11 11:31:24 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-01-15 12:43:12 +0000 |
| commit | c6bd9082f4c6b53b30ef6badb7169df31a052305 (patch) | |
| tree | 1fa49467b83e08168d755e42980965526f08816e /qmake/generators/makefile.h | |
| parent | b95a4bbe84e5216d8dba9a0c077062fbb0efb30b (diff) | |
Resolve macOS framework headers for extra compiler depend_command
On macOS, if an extra compiler returns a framework include via its
depend_command, we must resolve it properly.
For example, the uic extra compiler might return an include
"QtQuickWidget/QQuickWidget", but the actual header file is located in
"QtQuickWidget.framework/Headers/QQuickWidget".
Fixes: QTBUG-72641
Change-Id: I42f11c74d01c88db8a32025b7f04d9ad50b2d08b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 3a75f6f473..0535017ff6 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -55,6 +55,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo { QString spec; bool no_io; + bool resolveDependenciesInFrameworks = false; QHash<QString, bool> init_compiler_already; QString makedir, chkexists; QString build_args(); |