From 3ac50d2f7176754bf015827442126ead2e5bc8a3 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 30 Jun 2020 14:49:42 +0200
Subject: [PATCH] CMake: Specify Prefix in target_qt.conf for non-prefix builds

The EffectivePaths section does not inherit the Prefix value from
the Paths section.

Specfiy it explicitly, otherwise the paths reported by qmake -query
for /get variants ended up containing an extra "./bin/" part, which
ended up breaking building iOS apps with qmake.

Amends d7fd6848612760124871f0f3b55917250d078dd5

Task-number: QTBUG-85240
Task-number: QTBUG-84781
Task-number: QTBUG-82581
Change-Id: I288a6e76a21d779a7e03443777f8a4ce28df9974
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtBuild.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index d3b2c669af..87c46c96e7 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -1403,8 +1403,11 @@ HostData=${CMAKE_CURRENT_SOURCE_DIR}
 
         # Set $$[QT_HOST_DATA/get] to avoid falling back to the source dir where it isn't explicitly
         # requested.
+        # Also make sure to specif the Prefix as well, because it doesn't get inherited from the
+        # [Paths] section.
         string(APPEND content "[EffectivePaths]
 HostData=${ext_prefix}
+Prefix=${ext_prefix_relative_to_conf_file}
 ")
     endif()