all repos — mgba @ f2d5c3ff4dd58d2a66f599aab5a42079a66e7fdb

mGBA Game Boy Advance Emulator

Qt: More app metadata fixes
Vicki Pfau vi@endrift.com
Mon, 25 Feb 2019 20:54:47 -0800
commit

f2d5c3ff4dd58d2a66f599aab5a42079a66e7fdb

parent

d1288812e777d918f561658dfaed774d8255ee24

4 files changed, 11 insertions(+), 9 deletions(-)

jump to
M CHANGESCHANGES

@@ -1,3 +1,7 @@

+0.7.2: (Future) +Bugfixes: + - Qt: More app metadata fixes + 0.7.1: (2019-02-24) Bugfixes: - 3DS: Work around menu freezing (fixes mgba.io/i/1294)
M src/platform/qt/GBAApp.cppsrc/platform/qt/GBAApp.cpp

@@ -17,7 +17,6 @@ #include <QFileInfo>

#include <QFileOpenEvent> #include <QIcon> -#include <mgba/core/version.h> #include <mgba-util/socket.h> #include <mgba-util/vfs.h>

@@ -41,16 +40,9 @@ #ifdef BUILD_SDL

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()));
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -84,7 +84,6 @@ updateTitle();

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;
M src/platform/qt/main.cppsrc/platform/qt/main.cpp

@@ -61,7 +61,14 @@ usage(argv[0], subparser.usage);

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));