diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-03 10:07:03 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-04 16:24:53 +0000 |
| commit | 5c0de6ff93a2fbf55b8243bc2a31504ccab9bcba (patch) | |
| tree | a85f874e57f717fb6512b63c9faf408d248820e4 /mkspecs | |
| parent | a288ff8cc028e4e3c5290f2d8807da93b7333a8d (diff) | |
Fix include paths for prefix + framework + qtlibinfix builds of Qt
Prefix framework builds of Qt that use the -qtlibinfix had wrong include paths
in qt_lib_XXX.pri files which broke compilation of user projects. We now honor
QT_LIBINFIX in qt_lib_XXX.pri files.
However, due to how framework includes work, module-style includes like
#include <QtCore/qstring.h>
still do not work. Use <qstring.h> or <QString> instead.
Fixes: QTBUG-84219
Change-Id: I5314ee810e64cbba6dba06a84064d48bb4ff3377
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit a6d475d7db23620fc67c23303913beab3bc445e8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 7ee1a956f4..1835973d62 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -86,7 +86,7 @@ for(mod, MODULE_INCNAME) { MODULE$${sfwd}$${prv}_INCLUDES += $$mbibase/$$VERSION $$mbibase/$$VERSION/$$mod } prefix_build:module_frameworks { - mfbase = \$\$QT_MODULE_LIB_BASE/$${mod}.framework/Headers + mfbase = \$\$QT_MODULE_LIB_BASE/$${mod}$${QT_LIBINFIX}.framework/Headers MODULE_INCLUDES += $$mfbase MODULE$${prv}_INCLUDES += $$mfbase/$$VERSION $$mfbase/$$VERSION/$$mod } |