Merge pull request #9454 from liamwhite/wayland-egl
qt: handle wayland-egl platform name
This commit is contained in:
commit
da31326c17
|
@ -274,12 +274,14 @@ static Core::Frontend::WindowSystemType GetWindowSystemType() {
|
||||||
return Core::Frontend::WindowSystemType::X11;
|
return Core::Frontend::WindowSystemType::X11;
|
||||||
else if (platform_name == QStringLiteral("wayland"))
|
else if (platform_name == QStringLiteral("wayland"))
|
||||||
return Core::Frontend::WindowSystemType::Wayland;
|
return Core::Frontend::WindowSystemType::Wayland;
|
||||||
|
else if (platform_name == QStringLiteral("wayland-egl"))
|
||||||
|
return Core::Frontend::WindowSystemType::Wayland;
|
||||||
else if (platform_name == QStringLiteral("cocoa"))
|
else if (platform_name == QStringLiteral("cocoa"))
|
||||||
return Core::Frontend::WindowSystemType::Cocoa;
|
return Core::Frontend::WindowSystemType::Cocoa;
|
||||||
else if (platform_name == QStringLiteral("android"))
|
else if (platform_name == QStringLiteral("android"))
|
||||||
return Core::Frontend::WindowSystemType::Android;
|
return Core::Frontend::WindowSystemType::Android;
|
||||||
|
|
||||||
LOG_CRITICAL(Frontend, "Unknown Qt platform!");
|
LOG_CRITICAL(Frontend, "Unknown Qt platform {}!", platform_name.toStdString());
|
||||||
return Core::Frontend::WindowSystemType::Windows;
|
return Core::Frontend::WindowSystemType::Windows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -319,7 +321,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
|
||||||
input_subsystem->Initialize();
|
input_subsystem->Initialize();
|
||||||
this->setMouseTracking(true);
|
this->setMouseTracking(true);
|
||||||
|
|
||||||
strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland");
|
strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland") ||
|
||||||
|
QGuiApplication::platformName() == QStringLiteral("wayland-egl");
|
||||||
|
|
||||||
connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete);
|
connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete);
|
||||||
connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram,
|
connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram,
|
||||||
|
|
|
@ -3067,7 +3067,8 @@ static QScreen* GuessCurrentScreen(QWidget* window) {
|
||||||
|
|
||||||
bool GMainWindow::UsingExclusiveFullscreen() {
|
bool GMainWindow::UsingExclusiveFullscreen() {
|
||||||
return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive ||
|
return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive ||
|
||||||
QGuiApplication::platformName() == QStringLiteral("wayland");
|
QGuiApplication::platformName() == QStringLiteral("wayland") ||
|
||||||
|
QGuiApplication::platformName() == QStringLiteral("wayland-egl");
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::ShowFullscreen() {
|
void GMainWindow::ShowFullscreen() {
|
||||||
|
|
Reference in New Issue