yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Maintenance - fixing naming typos

Browse source 
Fix typos in signal naming var
Fix typo in KWin QPA environment variable
This commit is contained in:
Oleg Chernovskiy 2016-01-30 14:31:19 +03:00 committed by Martin Gräßlin
parent 357e082d7a
commit 61e1a98fb7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/wayland/kwin_wayland_test.h
View file

@ -57,7 +57,7 @@ int main(int argc, char *argv[]) \
{ \ { \
setenv("QT_QPA_PLATFORM", "wayland-org.kde.kwin.qpa", true); \ setenv("QT_QPA_PLATFORM", "wayland-org.kde.kwin.qpa", true); \
setenv("QT_QPA_PLATFORM_PLUGIN_PATH", KWINQPAPATH, true); \ setenv("QT_QPA_PLATFORM_PLUGIN_PATH", KWINQPAPATH, true); \
setenv("KWIN_FOCRE_OWN_QPA", "1", true); \ setenv("KWIN_FORCE_OWN_QPA", "1", true); \
DPI; \ DPI; \
KWin::WaylandTestApplication app(argc, argv); \ KWin::WaylandTestApplication app(argc, argv); \
app.setAttribute(Qt::AA_Use96Dpi, true); \ app.setAttribute(Qt::AA_Use96Dpi, true); \

10
main_wayland.cpp
View file

@ -421,11 +421,11 @@ int main(int argc, char * argv[])
if (signal(SIGHUP, KWin::sighandler) == SIG_IGN) if (signal(SIGHUP, KWin::sighandler) == SIG_IGN)
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
// ensure that no thread takes SIGUSR // ensure that no thread takes SIGUSR
sigset_t userSiganls; sigset_t userSignals;
sigemptyset(&userSiganls); sigemptyset(&userSignals);
sigaddset(&userSiganls, SIGUSR1); sigaddset(&userSignals, SIGUSR1);
sigaddset(&userSiganls, SIGUSR2); sigaddset(&userSignals, SIGUSR2);
pthread_sigmask(SIG_BLOCK, &userSiganls, nullptr); pthread_sigmask(SIG_BLOCK, &userSignals, nullptr);
QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();

2
plugins/qpa/main.cpp
View file

@ -33,7 +33,7 @@ public:
QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList &paramList) QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList &paramList)
{ {
Q_UNUSED(paramList) 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 // Not KWin
return nullptr; return nullptr;
} }