From a6d475d7db23620fc67c23303913beab3bc445e8 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Wed, 3 Jun 2020 10:07:03 +0200
Subject: Fix include paths for prefix + framework + qtlibinfix builds of Qt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
Pick-to: 5.15
Change-Id: I5314ee810e64cbba6dba06a84064d48bb4ff3377
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 mkspecs/features/qt_module_headers.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs/features')

diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index bd3d694195..7df1820248 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
     }
-- 
cgit v1.2.3