From 250391d3a4c3daa4ae3ba09b136165365b5b771f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 13 Feb 2020 09:26:07 +0200
Subject: [PATCH] Use INSTALL_MKSPECSDIR

---
 classes/qt6-cmake.bbclass    | 3 +++
 recipes-qt/qt6/qt6.inc       | 4 +---
 recipes-qt/qt6/qtbase_git.bb | 2 +-
 recipes-qt/qt6/qtsvg_git.bb  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass
index 8382e90..9721f18 100644
--- a/classes/qt6-cmake.bbclass
+++ b/classes/qt6-cmake.bbclass
@@ -31,6 +31,8 @@ QT6_INSTALL_EXAMPLESDIR = "${datadir}/examples"
 QT6_INSTALL_TESTSDIR = "${datadir}/tests"
 # Module description files directory [DATADIR/modules]
 QT6_INSTALL_DESCRIPTIONSDIR = "${datadir}/modules"
+# Mkspecs files [PREFIX/mkspecs]
+QT6_INSTALL_MKSPECSDIR = "${datadir}/mkspecs"
 
 EXTRA_OECMAKE += "\
     -DQT_CMAKE_DEBUG_EXTEND_TARGET=ON \
@@ -52,4 +54,5 @@ EXTRA_OECMAKE += "\
     -DINSTALL_SYSCONFDIR:PATH=${@os.path.relpath(d.getVar('QT6_INSTALL_SYSCONFDIR'), d.getVar('prefix') + '/')} \
     -DINSTALL_TESTSDIR:PATH=${@os.path.relpath(d.getVar('QT6_INSTALL_TESTSDIR'), d.getVar('prefix') + '/')} \
     -DINSTALL_TRANSLATIONSDIR:PATH=${@os.path.relpath(d.getVar('QT6_INSTALL_TRANSLATIONSDIR'), d.getVar('prefix') + '/')} \
+    -DINSTALL_MKSPECSDIR:PATH=${@os.path.relpath(d.getVar('QT6_INSTALL_MKSPECSDIR'), d.getVar('prefix') + '/')} \
 "
diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc
index c1bfdb1..8fb49f3 100644
--- a/recipes-qt/qt6/qt6.inc
+++ b/recipes-qt/qt6/qt6.inc
@@ -55,9 +55,7 @@ FILES_${PN} += " \
     ${QT6_INSTALL_LIBEXECDIR} \
 "
 
-# Note: Not all mkspecs are in [INSTALL_DATADIR]/mkspecs
 FILES_${PN}-dev += " \
-    ${QT6_INSTALL_DATADIR}/mkspecs \
     ${QT6_INSTALL_DESCRIPTIONSDIR} \
     ${QT6_INSTALL_DOCDIR} \
     ${QT6_INSTALL_INCLUDEDIR} \
@@ -67,10 +65,10 @@ FILES_${PN}-dev += " \
     ${QT6_INSTALL_LIBDIR}/cmake \
     ${QT6_INSTALL_LIBDIR}/metatypes \
     ${QT6_INSTALL_LIBDIR}/pkgconfig \
+    ${QT6_INSTALL_MKSPECSDIR} \
     ${QT6_INSTALL_QMLDIR}/*/designer \
     ${QT6_INSTALL_QMLDIR}/*/*/designer \
     ${QT6_INSTALL_QMLDIR}/*/*/*/designer \
-    ${prefix}/mkspecs \
 "
 
 FILES_${PN}-staticdev += " \
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 79876e1..9a19fd0 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -117,4 +117,4 @@ FILES_${PN}-tools += "\
 
 BBCLASSEXTEND =+ "native nativesdk"
 
-SRCREV = "9bab556005e4d0475eeaf1b279c1da9ddac398f3"
+SRCREV = "36089f5e7793bd8b15e5b43caf18f856ff2a18b0"
diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb
index dc65f77..e5c84a9 100644
--- a/recipes-qt/qt6/qtsvg_git.bb
+++ b/recipes-qt/qt6/qtsvg_git.bb
@@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "cf932594dcc9fa3e701e6cd8f564aa9fc3277563"
+SRCREV = "5c8d22a4374d5b5632d6e058c82160df22702b14"