diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-22 01:00:07 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-23 09:53:31 +0200 |
| commit | 0cf8e2fb974370fd6d370f92fa22fa2245bcebb0 (patch) | |
| tree | f7b471bd8abb111e32a220bca24bd508b7871cca /tools/qml/qml.qrc | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
| parent | 53bd6b8111eb0d7f23b3b0ca95bef4735f7a952c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
Change-Id: Ieff61c076e46eb50a059c8b0210f7f4d7ce0cbcf
Diffstat (limited to 'tools/qml/qml.qrc')
| -rw-r--r-- | tools/qml/qml.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qml/qml.qrc b/tools/qml/qml.qrc index 1f0ffdace2..e4be1793d4 100644 --- a/tools/qml/qml.qrc +++ b/tools/qml/qml.qrc @@ -2,5 +2,6 @@ <qresource prefix="qt-project.org/QmlRuntime"> <file>conf/configuration.qml</file> <file>conf/qtquick.qml</file> + <file>resources/qml-64.png</file> </qresource> </RCC> |