From d744714ac58b5afea6d8117af5290caf76422797 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 2 Nov 2014 02:58:58 -0800 Subject: [PATCH] Qt: Load configuration file --- src/platform/qt/GBAApp.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/platform/qt/GBAApp.cpp b/src/platform/qt/GBAApp.cpp index 216c43e06..28f09f0f6 100644 --- a/src/platform/qt/GBAApp.cpp +++ b/src/platform/qt/GBAApp.cpp @@ -4,6 +4,8 @@ #include +#define PORT "qt" + using namespace QGBA; GBAApp::GBAApp(int& argc, char* argv[]) @@ -14,6 +16,15 @@ GBAApp::GBAApp(int& argc, char* argv[]) QApplication::setApplicationName(PROJECT_NAME); QApplication::setApplicationVersion(PROJECT_VERSION); + struct Configuration config; + + ConfigurationInit(&config); + GBAConfigLoad(&config); + + GBAConfigMapGeneralOpts(&config, PORT, &m_opts); + + ConfigurationDeinit(&config); + if (parseArguments(&m_args, &m_opts, argc, argv, 0)) { m_window.setOptions(&m_opts); m_window.argumentsPassed(&m_args);