From 155a2e0d8d1d9c07fa22f523d84e3d583697aff4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Nov 2019 11:20:10 +0100 Subject: Fix usage of qtquickcompiler.prf after lrelease.prf Consider a project that sets CONFIG += lrelease embed_translations qtquickcompiler qtquickcompiler.prf is loaded first and loads resources.prf. Then lrelease.prf is loaded and extends RESOURCES. The latter changes are never picked up, because resources.prf was already loaded which is recorded in QMAKE_INTERNAL_INCLUDED_FEATURES. Use the newly introduced qtFlattenResources function instead of fully loading resources.prf. Task-number: QTBUG-79672 Change-Id: I1894ede97b4d5de567971a1a8cef407460bba97d Reviewed-by: Kai Koehne --- tools/qmlcachegen/qtquickcompiler.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 2f98aadefe..77906b19a6 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -31,7 +31,8 @@ defineTest(qtQuickSkippedResourceFile) { } # Flatten RESOURCES that may contain individual files or objects -load(resources) +load(resources_functions) +qtFlattenResources() NEWRESOURCES = QMLCACHE_RESOURCE_FILES = -- cgit v1.2.3 From e367e2c9dfcc2e832ce846829edf978d67291633 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 1 Jan 2020 00:37:58 +0100 Subject: Use the correct icon filename for QML Runtime on Windows Amends d7b7fed0cddf6236db3cf1bfdf9cc1380929cf5c. Task-number: QTBUG-70826 Change-Id: If9b74d19c4fc2bbe3ae882b4767919c74f3a38af Reviewed-by: Alessandro Portale --- tools/qml/qml.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index f086b7bff9..5dcbb3567a 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -8,7 +8,7 @@ RESOURCES += qml.qrc QMAKE_TARGET_DESCRIPTION = QML Runtime -ICON = resources/qml64.png +ICON = resources/qml-64.png win32 { RC_ICONS = resources/qml.ico } -- cgit v1.2.3