sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt: Drop Qt 6.1 workaround in Host::GetTopLevelWindowInfo()

Browse Source
This commit is contained in:
Stenzek
2023-11-27 00:15:55 +10:00
parent c40cc4ef43
commit 5a0a6ebe06
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/duckstation-qt/qthost.cpp
View File

@@ -118,6 +118,7 @@ EmuThread::~EmuThread() = default;
void QtHost::RegisterTypes()
{
// Register any standard types we need elsewhere
qRegisterMetaType<std::optional<WindowInfo>>("std::optional<WindowInfo>()");
qRegisterMetaType<std::optional<bool>>();
qRegisterMetaType<std::function<void()>>("std::function<void()>");
qRegisterMetaType<std::shared_ptr<SystemBootParameters>>();
@@ -1632,11 +1633,8 @@ void Host::RequestExit(bool allow_confirm)
std::optional<WindowInfo> Host::GetTopLevelWindowInfo()
{
// Normally we'd just feed the std::optional all the way through here. But that won't work because of some bug
// in Qt 6.1, and we can't upgrade that because of raging/abusive Win7 users... to anyone still using that dead
// OS, this is a passive-aggressive "screw you".
WindowInfo ret;
QMetaObject::invokeMethod(g_main_window, "getWindowInfo", Qt::BlockingQueuedConnection, Q_ARG(WindowInfo*, &ret));
std::optional<WindowInfo> ret;
QMetaObject::invokeMethod(g_main_window, &MainWindow::getWindowInfo, Qt::BlockingQueuedConnection, &ret);
return ret;
}