diff --git a/autotests/wayland/kwin_wayland_test.h b/autotests/wayland/kwin_wayland_test.h index 9599b3fe3b..d1df4fb324 100644 --- a/autotests/wayland/kwin_wayland_test.h +++ b/autotests/wayland/kwin_wayland_test.h @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) \ { \ setenv("QT_QPA_PLATFORM", "wayland-org.kde.kwin.qpa", true); \ setenv("QT_QPA_PLATFORM_PLUGIN_PATH", KWINQPAPATH, true); \ - setenv("KWIN_FOCRE_OWN_QPA", "1", true); \ + setenv("KWIN_FORCE_OWN_QPA", "1", true); \ DPI; \ KWin::WaylandTestApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ diff --git a/main_wayland.cpp b/main_wayland.cpp index 1b2efde521..28a5e83c0b 100644 --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -421,11 +421,11 @@ int main(int argc, char * argv[]) if (signal(SIGHUP, KWin::sighandler) == SIG_IGN) signal(SIGHUP, SIG_IGN); // ensure that no thread takes SIGUSR - sigset_t userSiganls; - sigemptyset(&userSiganls); - sigaddset(&userSiganls, SIGUSR1); - sigaddset(&userSiganls, SIGUSR2); - pthread_sigmask(SIG_BLOCK, &userSiganls, nullptr); + sigset_t userSignals; + sigemptyset(&userSignals); + sigaddset(&userSignals, SIGUSR1); + sigaddset(&userSignals, SIGUSR2); + pthread_sigmask(SIG_BLOCK, &userSignals, nullptr); QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp index 07b3ed09d4..e0894d001e 100644 --- a/plugins/qpa/main.cpp +++ b/plugins/qpa/main.cpp @@ -33,7 +33,7 @@ public: QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) { Q_UNUSED(paramList) - if (!QCoreApplication::applicationFilePath().endsWith(QLatin1Literal("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FOCRE_OWN_QPA")) { + if (!QCoreApplication::applicationFilePath().endsWith(QLatin1Literal("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { // Not KWin return nullptr; }