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.pro | |
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.pro')
-rw-r--r-- | tools/qml/qml.pro | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 3f41707275..f086b7bff9 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -8,10 +8,14 @@ RESOURCES += qml.qrc QMAKE_TARGET_DESCRIPTION = QML Runtime +ICON = resources/qml64.png +win32 { + RC_ICONS = resources/qml.ico +} mac { - OTHER_FILES += Info.plist - QMAKE_INFO_PLIST = Info.plist - ICON = qml.icns + OTHER_FILES += resources/Info.plist + QMAKE_INFO_PLIST = resources/Info.plist + ICON = resources/qml.icns } qtConfig(qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING |