diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:43 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-09 07:24:26 +0000 |
| commit | ba10b0b9ed93be007fcb156710ef6081000e3ae3 (patch) | |
| tree | ea17c625900b83d5955cb4a2db1587a5f07e2fb4 /tools | |
| parent | 653c25d48298fb747cf6f3b012816855c51d4260 (diff) | |
| parent | 1798d20ded699837f7b3afe0bb340617af266518 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/particles/qquickitemparticle.cpp
src/qmlmodels/qqmladaptormodel.cpp
tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
Change-Id: Ibd8fbb91da6893a09f4ffe61ad0b95d8149bbc87
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qml.pro | 2 | ||||
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 3 |
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 = |