aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qml/qml.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-19 01:00:04 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-19 01:00:04 +0200
commit53bd6b8111eb0d7f23b3b0ca95bef4735f7a952c (patch)
treef4b1407fa828e4d6ac608dbef97b4b9f3203a7cc /tools/qml/qml.pro
parent2bdbf216fe7b6cf9d404b80ac405bd3969f5c07f (diff)
parentc018df5b4075ae962966d4df7653d476dab02840 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'tools/qml/qml.pro')
-rw-r--r--tools/qml/qml.pro10
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