From 3a43ae168027f2cc179a7266a0e916e33470b150 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 3 Dec 2019 09:26:22 +0100
Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 effects/dimscreen/package/metadata.desktop      | 2 +-
 effects/eyeonscreen/package/metadata.desktop    | 2 +-
 effects/fade/package/metadata.desktop           | 2 +-
 effects/fadedesktop/package/metadata.desktop    | 2 +-
 effects/fadingpopups/package/metadata.desktop   | 4 ++--
 effects/frozenapp/package/metadata.desktop      | 4 ++--
 effects/glide/glide_config.desktop              | 2 +-
 effects/maximize/package/metadata.desktop       | 2 +-
 effects/scale/package/metadata.desktop          | 4 ++--
 effects/squash/package/metadata.desktop         | 4 ++--
 effects/translucency/package/metadata.desktop   | 2 +-
 effects/windowaperture/package/metadata.desktop | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/effects/dimscreen/package/metadata.desktop b/effects/dimscreen/package/metadata.desktop
index 1dc1543d99..13f9d510b1 100644
--- a/effects/dimscreen/package/metadata.desktop
+++ b/effects/dimscreen/package/metadata.desktop
@@ -40,7 +40,7 @@ Comment[nds]=Maakt den helen Schirm düüsterer, wenn na Systeempleger-Verlöven
 Comment[nl]=Maakt het volledige scherm donker wanneer er om root-privileges wordt verzocht
 Comment[nn]=Gjer heile skjermen mørkare når det vert spurt om rottilgang
 Comment[pa]=ਜਦੋਂ ਰੂਟ ਅਧਿਕਾਰਾਂ ਦੀ ਲੋੜ ਹੋਵੇ ਤਾਂ ਪੂਰੀ ਸਕਰੀਨ ਲਈ ਗੂੜ੍ਹਾ ਕਰੋ
-Comment[pl]=Przyciemnienie całego ekranu przy żądaniu praw administratora
+Comment[pl]=Przyciemnia ekran przy żądaniu praw administratora
 Comment[pt]=Escurece o ecrã inteiro ao pedir privilégios de administrador
 Comment[pt_BR]=Escurece a tela inteira ao solicitar privilégios de superusuário (root)
 Comment[ro]=Întunecă întregul ecran la cererea privilegiilor de root
diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop
index b3fbe5f47d..7fd4290046 100644
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@@ -62,7 +62,7 @@ Comment[ko]=창을 데스크톱으로 흡수시켜 데스크톱을 표시합니
 Comment[nb]=Sug vinduer inn i skrivebordet for å vise det. Dette minner deg kanskje om noe.
 Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren.
 Comment[nn]=Sug vindauge inn i skrivebordet for å visa skrivebordet. Dette minner deg kanskje om noko.
-Comment[pl]=Zasysa okna, aby pokazać pulpit. Skojarzenia powinny nasuwać się same.
+Comment[pl]=Zasysa okna na pulpicie, aby pokazać pulpit
 Comment[pt]=Suga as janelas para o ecrã mostrar a última. Isto podê-lo-á recordar de algo.
 Comment[pt_BR]=Suga as janelas na área de trabalho para mostrar a última. Isso pode lembrá-lo de algo.
 Comment[ru]=Для просмотра рабочего стола окна временно втягиваются в центр экрана
diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop
index ef7b986d11..04a88653d4 100644
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@@ -122,7 +122,7 @@ Comment[nds]=Finstern bi't Wiesen oder Versteken week in- oder utblennen
 Comment[nl]=Laat vensters vloeiend opkomen/vervagen als ze worden weergegeven of verborgen
 Comment[nn]=Ton vindauge inn og ut når dei vert viste eller gøymde
 Comment[pa]=ਜਦੋਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਵੇਖਾਉਣਾ ਜਾਂ ਓਹਲੇ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਕੂਲੇ ਢੰਗ ਨਾਲ ਫੇਡ ਇਨ/ਆਉਟ ਕਰੋ
-Comment[pl]=Gładkie zanikanie i wyłanianie się okien przy ich otwieraniu i zamykaniu
+Comment[pl]=Okna gładko wyłaniają się przy otwieraniu i zanikają przy zamykaniu
 Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
 Comment[pt_BR]=Faz as janelas aparecerem/desaparecerem suavemente quando são exibidas ou ocultadas
 Comment[ro]=Face ferestrele să se (de)coloreze când sunt afișate sau ascunse
diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop
index 60fe3e6f98..f54f56f11a 100644
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@@ -107,7 +107,7 @@ Comment[nds]=Bi't Wesseln de Schriefdischen överenanner blennen
 Comment[nl]=Laat virtuele bureaubladen vervagen en opkomen bij het wisselen
 Comment[nn]=Ton inn og ut ved veksling mellom virtuelle skrivebord
 Comment[pa]=ਜਦੋਂ ਵੁਰਚੁਅਲ ਡੈਸਕਟਾਪ ਵਿੱਚ ਬਦਲਣਾ ਹੋਵੇ ਤਾਂ ਉਹਨਾਂ ਨੂੰ ਫਿੱਕਾ ਕਰੋ
-Comment[pl]=Przenikanie wirtualnych pulpitów przy przełączaniu między nimi
+Comment[pl]=Przenika pulpity wirtualne przy ich przełączaniu
 Comment[pt]=Desvanece entre os ecrãs virtuais, ao circular entre eles
 Comment[pt_BR]=Desaparece entre as áreas de trabalho virtuais, ao alternar entre elas
 Comment[ro]=Estompare între birourile virtuale la comutarea între ele
diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop
index 35473a29f6..9709a90286 100644
--- a/effects/fadingpopups/package/metadata.desktop
+++ b/effects/fadingpopups/package/metadata.desktop
@@ -16,7 +16,7 @@ Name[it]=Finestre a comparsa che si dissolvono
 Name[ko]=페이드 팝업
 Name[nl]=Vervagende pop-ups
 Name[nn]=Inn- og uttoning av sprettoppvindauge
-Name[pl]=Zanikające okna wysuwne
+Name[pl]=Zanikanie okien wysuwnych
 Name[pt]=Mensagens Desvanecentes
 Name[pt_BR]=Desvanecer mensagens
 Name[ru]=Растворяющиеся всплывающие окна
@@ -44,7 +44,7 @@ Comment[it]=Fai dissolvere e comparire gradualmente le finestre a comparsa quand
 Comment[ko]=팝업이 보여지거나 감춰질 때 부드러운 페이드 인/아웃을 사용합니다
 Comment[nl]=Laat pop-ups vloeiend opkomen/vervagen als ze worden weergegeven of verborgen
 Comment[nn]=Ton sprettoppvindauge gradvis inn og ut når dei vert viste eller gøymde
-Comment[pl]=Gładkie zanikanie i wyłanianie się okien wysuwnych przy ich otwieraniu i zamykaniu
+Comment[pl]=Okna wysuwne gładko wyłaniają się przy otwieraniu i zanikają przy zamykaniu
 Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
 Comment[pt_BR]=Faz as mensagens aparecerem/desaparecerem suavemente quando são exibidas ou ocultadas
 Comment[ru]=Всплывающие окна при закрытии будут становиться всё более прозрачными, а потом совсем исчезать
diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop
index cd117d035b..cf6cdc0988 100644
--- a/effects/frozenapp/package/metadata.desktop
+++ b/effects/frozenapp/package/metadata.desktop
@@ -18,7 +18,7 @@ Name[it]=Desatura le applicazioni che non rispondono
 Name[ko]=응답 없는 프로그램을 무채색으로 전환
 Name[nl]=Verzadiging van niet responsieve toepassingen verminderen
 Name[nn]=Fjern fargemetting på ikkje-responsive program
-Name[pl]=Odbarw nieodpowiadające aplikacje
+Name[pl]=Odbarwienie nieodpowiadających aplikacji
 Name[pt]=Reduzir a Saturação das Aplicações Bloqueadas
 Name[pt_BR]=Reduzir saturação de aplicativos que não respondem
 Name[ru]=Обесцвечивание зависших приложений
@@ -54,7 +54,7 @@ Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate
 Comment[ko]=응답 없는 프로그램 창을 무채색으로 전환
 Comment[nl]=Verzadiging van vensters van niet responsieve (bevroren) toepassingen verminderen
 Comment[nn]=Fjern fargemetting på vindauge på program som ikkje lenger reagerer
-Comment[pl]=Odbarw okna nieodpowiadających (zawieszonych) aplikacji
+Comment[pl]=Odbarwia okna nieodpowiadających (zawieszonych) aplikacji
 Comment[pt]=Reduzir a saturação das janelas das aplicações sem resposta (bloqueadas)
 Comment[pt_BR]=Reduzir saturação de janelas de aplicativos que não respondem (travados)
 Comment[ru]=Обесцвечивание окон приложений, не отвечающих на запросы
diff --git a/effects/glide/glide_config.desktop b/effects/glide/glide_config.desktop
index f61ce241ba..0ee62a3a99 100644
--- a/effects/glide/glide_config.desktop
+++ b/effects/glide/glide_config.desktop
@@ -44,7 +44,7 @@ Name[nds]=Glieden
 Name[nl]=Schuiven
 Name[nn]=Skliding
 Name[pa]=ਗਲਾਈਡ
-Name[pl]=Szybowanie
+Name[pl]=Obracanie na zawiasie
 Name[pt]=Deslizar
 Name[pt_BR]=Deslizar
 Name[ro]=Scurgere
diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop
index e63b8a24b4..7350e60844 100644
--- a/effects/maximize/package/metadata.desktop
+++ b/effects/maximize/package/metadata.desktop
@@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering
 Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt
 Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren
 Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting.
-Comment[pl]=Efekt skalowania okien przy maksymalizowaniu i powrocie z niego
+Comment[pl]=Okna są gładko skalowane przy maksymalizacji i przy powrocie z niej
 Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização
 Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada
 Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare
diff --git a/effects/scale/package/metadata.desktop b/effects/scale/package/metadata.desktop
index 372068fcba..465bd94b67 100644
--- a/effects/scale/package/metadata.desktop
+++ b/effects/scale/package/metadata.desktop
@@ -18,7 +18,7 @@ Name[it]=Scala
 Name[ko]=크기 조정
 Name[nl]=Schalen
 Name[nn]=Skalering
-Name[pl]=Skala
+Name[pl]=Skalowanie
 Name[pt]=Escala
 Name[pt_BR]=Escala
 Name[ru]=Масштабирование
@@ -46,7 +46,7 @@ Comment[it]=Ridimensiona le finestre dolcemente quando sono mostrate o nascoste
 Comment[ko]=창이 보여지거나 감춰질 때 부드러운 크기 조정을 사용합니다
 Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen
 Comment[nn]=Skaler vindauge jamt inn og ut når dei vert viste eller gøymde
-Comment[pl]=Gładkie powiększanie i pomniejszanie okien przy ich otwieraniu i zamykaniu
+Comment[pl]=Okna gładko pomniejszają się przy otwieraniu i powiększają przy zamykaniu
 Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
 Comment[pt_BR]=Faz com que as janelas aumentem ou reduzam o seu tamanho de forma suave ao serem exibidas ou ocultadas
 Comment[ru]=Плавное увеличение или уменьшение окон при их появлении и скрытии
diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop
index 58de951eba..c50cdea9a9 100644
--- a/effects/squash/package/metadata.desktop
+++ b/effects/squash/package/metadata.desktop
@@ -15,7 +15,7 @@ Comment[it]=Schiaccia le finestre quando vengono minimizzate
 Comment[ko]=창을 최소화할 때 압축시킵니다
 Comment[nl]=Krimp vensters wanneer ze geminimaliseerd zijn
 Comment[nn]=Skvis vindauge når dei vert minimerte
-Comment[pl]=Ściskanie okien, gdy ulegają minimalizacji
+Comment[pl]=Ściąga okna przy ich minimalizacji
 Comment[pt]=Esmagar as janelas quando são minimizadas
 Comment[pt_BR]=Achatar as janelas quando são minimizadas
 Comment[ru]=Сжатие окна при сворачивании
@@ -42,7 +42,7 @@ Name[it]=Schiaccia
 Name[ko]=압축
 Name[nl]=Krimpen
 Name[nn]=Skvis
-Name[pl]=Ściskanie
+Name[pl]=Ściąganie
 Name[pt]=Esmagar
 Name[pt_BR]=Achatar
 Name[ru]=Сжатие
diff --git a/effects/translucency/package/metadata.desktop b/effects/translucency/package/metadata.desktop
index ceff2cf46a..7a822f362d 100644
--- a/effects/translucency/package/metadata.desktop
+++ b/effects/translucency/package/metadata.desktop
@@ -127,7 +127,7 @@ Comment[nds]=Finstern bi verscheden Bedingen dörschienen maken
 Comment[nl]=Maakt vensters doorschijnend onder andere condities
 Comment[nn]=Gjer vindauge i visse tilfelle gjennomsiktige
 Comment[pa]=ਵੱਖ ਵੱਖ ਹਾਲਤਾਂ ਵਿੱਚ ਵਿੰਡੋਜ਼ ਬਲੌਰੀ ਬਣਾਓ
-Comment[pl]=Prześwitywanie okien w zależności od różnych warunków
+Comment[pl]=Okna są prześwitujące w zależności od różnych warunków
 Comment[pt]=Torna as janelas translúcidas sob determinadas condições
 Comment[pt_BR]=Torna as janelas transparentes em determinadas condições
 Comment[ro]=Face ferestrele translucide în diferite condiții
diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop
index 13beb154a8..16dba25f35 100644
--- a/effects/windowaperture/package/metadata.desktop
+++ b/effects/windowaperture/package/metadata.desktop
@@ -62,7 +62,7 @@ Comment[ko]=데스크톱을 보일 때 창을 모서리로 이동
 Comment[nb]=Flytt vindu til hjørnene mens skrivebordet vises
 Comment[nl]=Schuif venster in de hoeken tijdens het tonen van het bureaublad
 Comment[nn]=Flytt vindauge til hjørna mens skrivebordet vert vist
-Comment[pl]=Rozsuwa okna w narożniki, podczas pokazywania pulpitu
+Comment[pl]=Rozsuwa okna w narożniki, aby pokazać pulpit
 Comment[pt]=Mover a janela para os cantos, enquanto mostra o ecrã
 Comment[pt_BR]=Move a janela para os cantos, enquanto mostra a área de trabalho
 Comment[ru]=Для просмотра рабочего стола окна временно разлетаются в разные стороны

From 22abd0d2632945777bc334308c61a7e57e3a5383 Mon Sep 17 00:00:00 2001
From: Jonathan Riddell <jr@jriddell.org>
Date: Tue, 3 Dec 2019 11:47:22 +0000
Subject: [PATCH 2/4] Update version number for 5.17.4 GIT_SILENT

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 828e677843..6eb178e05f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 project(KWIN)
-set(PROJECT_VERSION "5.17.3")
+set(PROJECT_VERSION "5.17.4")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.12.0")

From cab72500b573ba4a71d67a1cc6f4c4e64f606405 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 10 Dec 2019 09:23:03 +0100
Subject: [PATCH 3/4] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 effects/fadingpopups/package/metadata.desktop                | 2 ++
 kcmkwin/kwinscreenedges/kwinscreenedges.desktop              | 1 +
 kcmkwin/kwinscreenedges/kwintouchscreen.desktop              | 1 +
 plugins/kpackage/effect/kwin-packagestructure-effect.desktop | 1 +
 4 files changed, 5 insertions(+)

diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop
index 9709a90286..b26f0854e9 100644
--- a/effects/fadingpopups/package/metadata.desktop
+++ b/effects/fadingpopups/package/metadata.desktop
@@ -11,6 +11,7 @@ Name[eu]=Itzaleztatzen diren gainerakorrak
 Name[fi]=Hiipuvat ponnahdusikkunat
 Name[fr]=Fondu des boites de dialogue
 Name[gl]=Xanelas emerxentes que esvaen
+Name[hu]=Halványodó felugró ablakok
 Name[id]=Sembulan Melesap
 Name[it]=Finestre a comparsa che si dissolvono
 Name[ko]=페이드 팝업
@@ -39,6 +40,7 @@ Comment[eu]=Gainerakorrak emeki agertzen eta desagertzen ditu haiek erakustean e
 Comment[fi]=Ponnahdusikkunat tulevat näkyviin tai poistuvat näkyvistä pehmeästi häivyttäen
 Comment[fr]=Estompe ou fait apparaître en fondu les boites de dialogue lorsqu'elles sont affichées ou cachées
 Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas
+Comment[hu]=A felugró folyamatosan áttűnő módon lesznek elrejtve és megjelenítve
 Comment[id]=Buat sembulan secara halus lesap-muncul dan lesap-hilang ketika ia ditampilkan atau disembunyikan
 Comment[it]=Fai dissolvere e comparire gradualmente le finestre a comparsa quando vengono mostrate o nascoste
 Comment[ko]=팝업이 보여지거나 감춰질 때 부드러운 페이드 인/아웃을 사용합니다
diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
index 16e68d3af8..196cb34d7c 100644
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@@ -88,6 +88,7 @@ Comment[eu]=Konfiguratu pantailaren izkina eta ertz aktiboak
 Comment[fi]=Aseta näytön aktiiviset reunat ja kulmat
 Comment[fr]=Configurer les bords et les coins d'écran actifs
 Comment[gl]=Configurar os bordos e esquinas activos da pantalla
+Comment[hu]=Aktív képernyősarkok és szélek beállítása
 Comment[id]=Konfigurasikan tepian dan sudut layar aktif
 Comment[it]=Configura angoli e bordi attivi dello schermo
 Comment[ko]=활성 화면 경계와 꼭짓점 설정
diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
index f2ff866d86..a9fbbb0b41 100644
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@@ -57,6 +57,7 @@ Comment[eu]=Konfiguratu ukimen-pantailako kolpe arinen keinuak
 Comment[fi]=Aseta kosketusnäytön pyyhkäisyeleet
 Comment[fr]=Configurer les mouvements sur l'écran tactile
 Comment[gl]=Configurar os xestos de pantalla táctil
+Comment[hu]=Érintőképernyő-gesztusok beállítása
 Comment[id]=Konfigurasikan gestur usapan layar sentuh
 Comment[it]=Configura gesti dello schermo a sfioramento
 Comment[ko]=터치 스크린 밀기 제스처 설정
diff --git a/plugins/kpackage/effect/kwin-packagestructure-effect.desktop b/plugins/kpackage/effect/kwin-packagestructure-effect.desktop
index 6993b85985..9033b759a3 100644
--- a/plugins/kpackage/effect/kwin-packagestructure-effect.desktop
+++ b/plugins/kpackage/effect/kwin-packagestructure-effect.desktop
@@ -12,6 +12,7 @@ Name[eu]=KWin efektua
 Name[fi]=KWin-tehoste
 Name[fr]=Effet KWin
 Name[gl]=Efecto de KWin
+Name[hu]=KWin effektus
 Name[id]=Efek KWin
 Name[it]=Effetto di KWin
 Name[ko]=KWin 효과

From 1a13015d2d1de3ffb9450143480e729057992c45 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Sat, 14 Dec 2019 16:08:16 +0100
Subject: [PATCH 4/4] Possible fix for KDecoration crash in systemsettings

Summary:
I could never reproduce the crash, but we know from gdb that it's from
the decorationSettings object

We are setting the same QObject instance as a context property in
multiple contexts at once. This is already slightly odd especially from the POV of
Qt's internal property cache.

Given we want one object to be exposed to all contexts, we can expose it
to the parent context only once and achieve the same result in a simpler
way.

BUG: 411166

Test Plan:
Verified opening and closing system settings still worked for me.
I could never reproduce the original crash.

Reviewers: #kwin, ngraham

Reviewed By: ngraham

Subscribers: ngraham, apol, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D25913
---
 plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
index f3ad059616..c37f00ee29 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
@@ -262,6 +262,7 @@ Decoration::Decoration(QObject *parent, const QVariantList &args)
 {
     m_themeName = findTheme(args);
     Helper::instance().ref();
+    Helper::instance().rootContext()->setContextProperty(QStringLiteral("decorationSettings"), settings().data());
 }
 
 Decoration::~Decoration()
@@ -289,7 +290,6 @@ void Decoration::init()
 
     m_qmlContext = new QQmlContext(Helper::instance().rootContext(), this);
     m_qmlContext->setContextProperty(QStringLiteral("decoration"), this);
-    m_qmlContext->setContextProperty(QStringLiteral("decorationSettings"), s.data());
     auto component = Helper::instance().component(m_themeName);
     if (!component) {
         return;