CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct QmlImportsPath config with qmake

Browse Source 
Qml2ImportsPath is deprecated config and QmlImportsPath should
be used instead. This fixes qmake crash on aarch64 linux when
using GCC 14.

Pick-to: 6.9 6.8 6.5
Fixes: QTBUG-132288
Change-Id: I683ae7755b0b8ac496eeb8017c1c0d059b2fe011
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2024-12-18 14:07:05 +00:00
parent 5fa2f694a3
commit 9b6d9d6287
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/populate_sdk_qt6_base.bbclass
View File

@ -27,7 +27,7 @@ create_qt6_sdk_files () {
echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf
echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf
echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf
echo 'Qml2Imports = ${QT6_INSTALL_QMLDIR}' >> $qtconf echo 'QmlImports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
echo 'Translations = ${QT6_INSTALL_TRANSLATIONSDIR}' >> $qtconf echo 'Translations = ${QT6_INSTALL_TRANSLATIONSDIR}' >> $qtconf
echo 'Documentation = ${QT6_INSTALL_DOCDIR}' >> $qtconf echo 'Documentation = ${QT6_INSTALL_DOCDIR}' >> $qtconf
echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf

6
classes/qt6-qmake.bbclass
View File

@ -92,7 +92,7 @@ Data = ${OE_QMAKE_PATH_DATA}
Binaries = ${OE_QMAKE_PATH_BINS} Binaries = ${OE_QMAKE_PATH_BINS}
LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
Plugins = ${OE_QMAKE_PATH_PLUGINS} Plugins = ${OE_QMAKE_PATH_PLUGINS}
Qml2Imports = ${OE_QMAKE_PATH_QML} QmlImports = ${OE_QMAKE_PATH_QML}
Translations = ${OE_QMAKE_PATH_TRANSLATIONS} Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
Documentation = ${OE_QMAKE_PATH_DOCS} Documentation = ${OE_QMAKE_PATH_DOCS}
Settings = ${OE_QMAKE_PATH_SETTINGS} Settings = ${OE_QMAKE_PATH_SETTINGS}
@ -124,7 +124,7 @@ Data = ${OE_QMAKE_PATH_DATA}
Binaries = ${OE_QMAKE_PATH_BINS} Binaries = ${OE_QMAKE_PATH_BINS}
LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
Plugins = ${OE_QMAKE_PATH_PLUGINS} Plugins = ${OE_QMAKE_PATH_PLUGINS}
Qml2Imports = ${OE_QMAKE_PATH_QML} QmlImports = ${OE_QMAKE_PATH_QML}
Translations = ${OE_QMAKE_PATH_TRANSLATIONS} Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
Documentation = ${OE_QMAKE_PATH_DOCS} Documentation = ${OE_QMAKE_PATH_DOCS}
Settings = ${OE_QMAKE_PATH_SETTINGS} Settings = ${OE_QMAKE_PATH_SETTINGS}
@ -162,7 +162,7 @@ EOF
# Binaries The location of installed Qt binaries (tools and applications). # Binaries The location of installed Qt binaries (tools and applications).
# Plugins The location of installed Qt plugins. # Plugins The location of installed Qt plugins.
# Imports The location of installed QML extensions to import (QML 1.x). # Imports The location of installed QML extensions to import (QML 1.x).
# Qml2Imports The location of installed QML extensions to import (QML 2.x). # QmlImports The location of installed QML extensions to import (QML 2.x).
# ArchData The location of general architecture-dependent Qt data. # ArchData The location of general architecture-dependent Qt data.
# Data The location of general architecture-independent Qt data. # Data The location of general architecture-independent Qt data.
# Translations The location of translation information for Qt strings. # Translations The location of translation information for Qt strings.