aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-09 01:00:43 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-01-09 16:37:06 +0000
commit0a73952d4e36b0fd492499e635880ca49f752f04 (patch)
treeb14df34719013c57be346da01380ea2d5b6b1160 /tools
parent3e92cd7391855ff7189a3802db1e9fcc5e96ed13 (diff)
parentba10b0b9ed93be007fcb156710ef6081000e3ae3 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/qml.pro2
-rw-r--r--tools/qmlcachegen/qtquickcompiler.prf3
2 files changed, 3 insertions, 2 deletions
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
}
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
index a31a7f5714..8aac3b9e07 100644
--- a/tools/qmlcachegen/qtquickcompiler.prf
+++ b/tools/qmlcachegen/qtquickcompiler.prf
@@ -27,7 +27,8 @@ defineReplace(qmlCacheResourceFileOutputName) {
}
# Flatten RESOURCES that may contain individual files or objects
-load(resources)
+load(resources_functions)
+qtFlattenResources()
NEWRESOURCES =
QMLCACHE_RESOURCE_FILES =