summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeokYeon Hwang <syeon.hwang@samsung.com>2014-11-05 21:04:31 -0800
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2014-11-05 21:04:31 -0800
commita37c930db54216876ff14fd9c7047a6038742b9b (patch)
tree3bf30380632215ec9ac019336cea4295373bb061
parent2258f489d9ac6f74254204edd086646ab8734cc5 (diff)
parent2d2eacbc07ff31d06223fad2c8365fcc78c8763a (diff)
downloadqemu-a37c930db54216876ff14fd9c7047a6038742b9b.tar.gz
qemu-a37c930db54216876ff14fd9c7047a6038742b9b.tar.bz2
qemu-a37c930db54216876ff14fd9c7047a6038742b9b.zip
Merge "ui: Tizen icon apply to Emulator on Windows" into features/qt_dr
-rw-r--r--version.rc4
1 files changed, 4 insertions, 0 deletions
diff --git a/version.rc b/version.rc
index d42ef62962..c7922d5200 100644
--- a/version.rc
+++ b/version.rc
@@ -27,4 +27,8 @@ FILESUBTYPE VFT2_UNKNOWN
}
}
+#ifdef CONFIG_MARU
+IDI_ICON1 ICON "tizen/src/ui/resource/icons/emulator_icon.ico"
+#else
IDI_ICON1 ICON "pc-bios/qemu-nsis.ico"
+#endif