From bae0db8d764aeebe516fc48f22cd38d853d26b38 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 30 Dec 2024 14:36:02 +0000
Subject: [PATCH] Install module JSON files to INSTALL_ARCHDATADIR/modules

The module description JSON files contain architecture-specific
information. Therefore they should reside below INSTALL_ARCHDATADIR
instead of INSTALL_DATADIR.

Pick-to: 6.9 6.8 6.5
Fixes: QTBUG-132428
Change-Id: Ib6f2e8939e27f136ac6cb04e74b9d688c8600b2b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
---
 classes/qt6-paths.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/qt6-paths.bbclass b/classes/qt6-paths.bbclass
index 7f0005c..abb5db8 100644
--- a/classes/qt6-paths.bbclass
+++ b/classes/qt6-paths.bbclass
@@ -27,7 +27,7 @@ QT6_INSTALL_SYSCONFDIR ?= "${sysconfdir}/xdg"
 QT6_INSTALL_EXAMPLESDIR ?= "${datadir}/examples"
 # Tests [PREFIX/tests]
 QT6_INSTALL_TESTSDIR ?= "${prefix}/tests"
-# Module description files directory [DATADIR/modules]
-QT6_INSTALL_DESCRIPTIONSDIR ?= "${datadir}/modules"
+# Module description files directory [ARCHDATADIR/modules]
+QT6_INSTALL_DESCRIPTIONSDIR ?= "${libdir}/modules"
 # Mkspecs files [PREFIX/mkspecs]
 QT6_INSTALL_MKSPECSDIR ?= "${libdir}/mkspecs"