diff options
Diffstat (limited to 'external/meta-qt5/recipes-qt/qt5/qtdeclarative')
3 files changed, 89 insertions, 31 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch deleted file mode 100644 index a734f8a2..00000000 --- a/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 2 Jul 2018 13:32:44 +0300 -Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH - -git describe can produce different strings for the same sha1, depending -on the version of git (length of short hash) and whether release tag was -in place when build was done (v5.11.1-0- vs. v5.11.0-66-). - -Instead use rev-parse to get the unambiguous commit sha1 which is also -what is used from the .tag file. - -Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559 -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> ---- - src/qml/qml.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qml/qml.pro b/src/qml/qml.pro -index 940ebb325..a76a87b15 100644 ---- a/src/qml/qml.pro -+++ b/src/qml/qml.pro -@@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH - !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { - QML_COMPILE_HASH = $$tag - } else:exists($$PWD/../../.git) { -- commit = $$system(git describe --tags --always --long --dirty) -+ commit = $$system(git rev-parse HEAD) - QML_COMPILE_HASH = $$commit - } - compile_hash_contents = \ diff --git a/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch b/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch new file mode 100644 index 00000000..60922e74 --- /dev/null +++ b/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch @@ -0,0 +1,32 @@ +From d39e76b9662ea9cf236ac59749855e7da7ad29a8 Mon Sep 17 00:00:00 2001 +From: Piotr Tworek <tworaz@tworaz.net> +Date: Wed, 3 Jul 2019 01:13:40 +0200 +Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen + +Without this cmake will end up using host qmlcachegen instead of +recipe-sysroot-native one. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Piotr Tworek <tworaz@tworaz.net> +--- + tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in +index 75fbb0fcf3..1e949cd40c 100644 +--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in ++++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in +@@ -18,11 +18,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) + + find_package(Qt5 COMPONENTS Qml Core) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(compiler_path \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmlcachegen$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(compiler_path \"$${CMAKE_BIN_DIR}qmlcachegen$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(compiler_path \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmlcachegen${OE_QMAKE_BIN_SUFFIX}\") + if(NOT EXISTS \"${compiler_path}\" ) + message(FATAL_ERROR \"The package \\\"Qt5QuickCompilerConfig\\\" references the file + \\\"${compiler_path}\\\" diff --git a/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch b/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch new file mode 100644 index 00000000..f55812b6 --- /dev/null +++ b/external/meta-qt5/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch @@ -0,0 +1,57 @@ +From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Nov 2019 21:10:03 -0800 +Subject: [PATCH] Use python3 explicitly + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + qtdeclarative.pro | 2 +- + src/3rdparty/masm/masm.pri | 4 ++-- + tests/auto/qml/ecmascripttests/test262.py | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/qtdeclarative.pro b/qtdeclarative.pro +index 5b94da9b69..0e3496ce80 100644 +--- a/qtdeclarative.pro ++++ b/qtdeclarative.pro +@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools + load(qt_parts) + + !python_available { +- py_out = $$system('python -c "print(1)"') ++ py_out = $$system('python3 -c "print(1)"') + !equals(py_out, 1): error("Building QtQml requires Python.") + tmp = python_available + CONFIG += $$tmp +diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri +index 1df4585aae..00038104ec 100644 +--- a/src/3rdparty/masm/masm.pri ++++ b/src/3rdparty/masm/masm.pri +@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { + udis86.output = udis86_itab.h + udis86.input = ITAB + udis86.CONFIG += no_link +- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} ++ udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} + QMAKE_EXTRA_COMPILERS += udis86 + + udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c +@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h + retgen.script = $$PWD/yarr/create_regex_tables + retgen.input = retgen.script + retgen.CONFIG += no_link +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT} + QMAKE_EXTRA_COMPILERS += retgen + + # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf +diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py +index 19551e3ba2..bf3f79a45f 100755 +--- a/tests/auto/qml/ecmascripttests/test262.py ++++ b/tests/auto/qml/ecmascripttests/test262.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + ############################################################################# + ## + ## Copyright (C) 2017 The Qt Company Ltd. |