summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-11-09 20:38:11 -0500
committerGravatar Zach Hilman2018-11-18 10:53:47 -0500
commita81645400f9ba40b272163ef6f751ba3428b85a1 (patch)
treed552327edfbcd8a37321a0cfb2520c37c7cd4869
parentam: Construct and use proper applets with ILibraryAppletAccessor (diff)
downloadyuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.gz
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.xz
yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.zip
qt/main: Register Qt Software Keyboard frontend with AM
Allows using Qt provider over default.
Diffstat (limited to '')
-rw-r--r--src/core/frontend/applets/software_keyboard.cpp1
-rw-r--r--src/yuzu/applets/software_keyboard.cpp1
-rw-r--r--src/yuzu/main.cpp4
3 files changed, 6 insertions, 0 deletions
diff --git a/src/core/frontend/applets/software_keyboard.cpp b/src/core/frontend/applets/software_keyboard.cpp
index 8cb888a62..c1bacefef 100644
--- a/src/core/frontend/applets/software_keyboard.cpp
+++ b/src/core/frontend/applets/software_keyboard.cpp
@@ -3,6 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common/logging/backend.h" 5#include "common/logging/backend.h"
6#include "common/string_util.h"
6#include "core/frontend/applets/software_keyboard.h" 7#include "core/frontend/applets/software_keyboard.h"
7 8
8namespace Frontend { 9namespace Frontend {
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp
index 9e1c59626..bd8bd0dd0 100644
--- a/src/yuzu/applets/software_keyboard.cpp
+++ b/src/yuzu/applets/software_keyboard.cpp
@@ -9,6 +9,7 @@
9#include <QLineEdit> 9#include <QLineEdit>
10#include <QVBoxLayout> 10#include <QVBoxLayout>
11#include "common/logging/backend.h" 11#include "common/logging/backend.h"
12#include "common/string_util.h"
12#include "yuzu/applets/software_keyboard.h" 13#include "yuzu/applets/software_keyboard.h"
13 14
14QtSoftwareKeyboardValidator::QtSoftwareKeyboardValidator( 15QtSoftwareKeyboardValidator::QtSoftwareKeyboardValidator(
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 999086e7f..7b2a01169 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -8,9 +8,11 @@
8#include <thread> 8#include <thread>
9 9
10// VFS includes must be before glad as they will conflict with Windows file api, which uses defines. 10// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
11#include "applets/software_keyboard.h"
11#include "core/file_sys/vfs.h" 12#include "core/file_sys/vfs.h"
12#include "core/file_sys/vfs_real.h" 13#include "core/file_sys/vfs_real.h"
13#include "core/hle/service/acc/profile_manager.h" 14#include "core/hle/service/acc/profile_manager.h"
15#include "core/hle/service/am/applets/applets.h"
14 16
15// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows 17// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows
16// defines. 18// defines.
@@ -559,6 +561,8 @@ bool GMainWindow::LoadROM(const QString& filename) {
559 561
560 system.SetGPUDebugContext(debug_context); 562 system.SetGPUDebugContext(debug_context);
561 563
564 Service::AM::Applets::RegisterSoftwareKeyboard(std::make_shared<QtSoftwareKeyboard>(*this));
565
562 const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())}; 566 const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
563 567
564 const auto drd_callout = 568 const auto drd_callout =