From a39a0e5419b6b23721ee847f32d9668eb3c2220a Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Fri, 21 Jun 2019 16:45:37 +0200
Subject: [PATCH] Fix build of modules outside of QtBase when cross-compiling

The Qt::Platform target includes the mkspecs/$spec directory, which we
must unconditionally install as long as we use it.

Change-Id: I272650a887b5b0b3bd868524784dca65b76b02d9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 CMakeLists.txt       | 9 +++++++++
 qmake/CMakeLists.txt | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5566870576c..242961b7173 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,15 @@ if (QT_WILL_BUILD_TOOLS)
     add_subdirectory(qmake)
 endif()
 
+# As long as we use the mkspecs (for qplatformdefs.h), we need to always
+# install it, especially when cross-compiling.
+set(mkspecs_install_dir "${INSTALL_DATADIR}")
+qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})
+
+qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs"
+                   DESTINATION ${mkspecs_install_dir})
+
+
 qt_build_repo_end()
 
 option(BUILD_EXAMPLES "Build Qt examples" ON)
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 7146776d675..438f21d767e 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -1,13 +1,5 @@
 # Generated from qmake.pro.
 
-# special case begin
-set(path_component "${INSTALL_DATADIR}")
-qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${path_component})
-
-qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs"
-                   DESTINATION ${mkspecs_install_dir})
-# special case end
-
 #####################################################################
 ## qmake Binary:
 #####################################################################