diff options
| author | Dr. Chat <arkolbed@gmail.com> | 2018-05-15 14:04:18 -0500 |
|---|---|---|
| committer | Dr. Chat <arkolbed@gmail.com> | 2018-10-12 14:54:13 -0500 |
| commit | 20360cce48774841109208cb023959f32bac02d6 (patch) | |
| tree | b6d3858646cc0fa64aa68ed5eb6bad45e12ef5ad | |
| parent | 90929d74a8794fe4566fae376b34907cbb9f588b (diff) | |
[Qt] Setup main window icon
| -rw-r--r-- | src/xenia/app/icon.ico (renamed from assets/icon/icon.ico) | bin | 227279 -> 227279 bytes | |||
| -rw-r--r-- | src/xenia/app/main_resources.rc | 3 | ||||
| -rw-r--r-- | src/xenia/app/xenia.qrc | 1 | ||||
| -rw-r--r-- | src/xenia/app/xenia_main.cc | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/assets/icon/icon.ico b/src/xenia/app/icon.ico Binary files differindex 50a1b7658..50a1b7658 100644 --- a/assets/icon/icon.ico +++ b/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 @@ <RCC> <qresource prefix="/"> + <file>icon.ico</file> </qresource> </RCC> 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<std::wstring>& args) { char* argv[] = {"xenia", nullptr}; QApplication app(argc, argv); EmulatorWindow main_wnd; - + main_wnd.setWindowIcon(QIcon(":/icon.ico")); main_wnd.setFixedSize(1280, 720); /* |