Merge branch 'Plasma/5.19'

README.md

@@ -45,4 +45,4 @@ A new Feature can only be added to KWin if:
 
 All new added features are under probation, that is if any of the non-functional requirements as listed above do not hold true in the next two feature releases, the added feature will be removed again.
 
-The same non functional requirements hold true for any kind of plugins (effects, scripts, etc.). It is suggested to use scripted plugins and distribute them separately.
+The same non functional requirements hold true for any kind of plugins (effects, scripts, etc.). It is suggested to use scripted plugins and distribute them separately.

kcmkwin/kwinscreenedges/main.ui

@@ -84,7 +84,7 @@
         <string>&amp;Tile:</string>
        </property>
        <property name="buddy">
-        <cstring>quickTileBox</cstring>
+        <cstring>kcfg_ElectricBorderTiling</cstring>
        </property>
       </widget>
      </item>

plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp

@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 void PlastikPlugin::registerTypes(const char *uri)
 {
-    Q_UNUSED(uri)
+    // Need to register something to tell Qt that it loaded (QTBUG-84571)
+    qmlRegisterModule(uri, 1, 0);
 }
 
 void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

plugins/kdecorations/aurorae/themes/plastik/code/qmldir

@@ -1,5 +1,2 @@
 module org.kde.kwin.decorations.plastik
 plugin plastikplugin
-
-# we need to have at least one element of Qt is not able to find the plugin *shrug*
-Foo 1.0 Foo.qml