Qt: More app metadata fixes

CHANGES

@@ -7,6 +7,7 @@ Bugfixes:
  - GBA: All IRQs have 7 cycle delay (fixes mgba.io/i/539, mgba.io/i/1208)
  - GBA: Reset now reloads multiboot ROMs
  - GBA BIOS: Fix multiboot entry point (fixes Magic Floor)
+ - Qt: More app metadata fixes
 Misc:
  - GBA Savedata: EEPROM performance fixes
  - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash

src/platform/qt/GBAApp.cpp

@@ -18,7 +18,6 @@
 #include <QFileOpenEvent>
 #include <QIcon>
 
-#include <mgba/core/version.h>
 #include <mgba-util/socket.h>
 #include <mgba-util/vfs.h>
 
@@ -42,17 +41,10 @@ GBAApp::GBAApp(int& argc, char* argv[], ConfigController* config)
 	SDL_Init(SDL_INIT_NOPARACHUTE);
 #endif
 
-#ifndef Q_OS_MAC
-	setWindowIcon(QIcon(":/res/mgba-512.png"));
-#endif
-
 	SocketSubsystemInit();
 	qRegisterMetaType<const uint32_t*>("const uint32_t*");
 	qRegisterMetaType<mCoreThread*>("mCoreThread*");
 
-	QApplication::setApplicationName(projectName);
-	QApplication::setApplicationVersion(projectVersion);
-
 	if (!m_configController->getQtOption("displayDriver").isNull()) {
 		Display::setDriver(static_cast<Display::Driver>(m_configController->getQtOption("displayDriver").toInt()));
 	}

src/platform/qt/Window.cpp

@@ -85,7 +85,6 @@ Window::Window(CoreManager* manager, ConfigController* config, int playerId, QWi
 
 	m_logo.setDevicePixelRatio(m_screenWidget->devicePixelRatio());
 	m_logo = m_logo; // Free memory left over in old pixmap
-	setWindowIcon(m_logo);
 
 #if defined(M_CORE_GBA)
 	float i = 2;

src/platform/qt/main.cpp

@@ -61,8 +61,15 @@ int main(int argc, char* argv[]) {
 		return 0;
 	}
 
+	QApplication::setApplicationName(projectName);
+	QApplication::setApplicationVersion(projectVersion);
+
 	GBAApp application(argc, argv, &configController);
 
+#ifndef Q_OS_MAC
+	QApplication::setWindowIcon(QIcon(":/res/mgba-1024.png"));
+#endif
+
 	QTranslator qtTranslator;
 	qtTranslator.load(locale, "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 	application.installTranslator(&qtTranslator);