From 20360cce48774841109208cb023959f32bac02d6 Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Tue, 15 May 2018 14:04:18 -0500 Subject: [PATCH] [Qt] Setup main window icon --- {assets/icon => src/xenia/app}/icon.ico | Bin src/xenia/app/main_resources.rc | 3 --- src/xenia/app/xenia.qrc | 1 + src/xenia/app/xenia_main.cc | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename {assets/icon => src/xenia/app}/icon.ico (100%) delete mode 100644 src/xenia/app/main_resources.rc diff --git a/assets/icon/icon.ico b/src/xenia/app/icon.ico similarity index 100% rename from assets/icon/icon.ico rename to src/xenia/app/icon.ico diff --git a/src/xenia/app/main_resources.rc b/src/xenia/app/main_resources.rc deleted file mode 100644 index bcc22d20f..000000000 --- a/src/xenia/app/main_resources.rc +++ /dev/null @@ -1,3 +0,0 @@ -//{{NO_DEPENDENCIES}} - -MAINICON ICON "..\\..\\..\\assets\\icon\\icon.ico" diff --git a/src/xenia/app/xenia.qrc b/src/xenia/app/xenia.qrc index af8a564b3..3f69c5f5d 100644 --- a/src/xenia/app/xenia.qrc +++ b/src/xenia/app/xenia.qrc @@ -1,4 +1,5 @@ + icon.ico diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc index ed5106e8d..e1bd0bbbf 100644 --- a/src/xenia/app/xenia_main.cc +++ b/src/xenia/app/xenia_main.cc @@ -37,7 +37,7 @@ int xenia_main(const std::vector& args) { char* argv[] = {"xenia", nullptr}; QApplication app(argc, argv); EmulatorWindow main_wnd; - + main_wnd.setWindowIcon(QIcon(":/icon.ico")); main_wnd.setFixedSize(1280, 720); /*