diff --git a/shell/osd.h b/shell/osd.h --- a/shell/osd.h +++ b/shell/osd.h @@ -26,7 +26,7 @@ #include namespace KDeclarative { - class QmlObject; + class QmlObjectSharedEngine; } namespace Plasma { } @@ -70,7 +70,7 @@ void showOsd(); QUrl m_osdUrl; - KDeclarative::QmlObject *m_osdObject = nullptr; + KDeclarative::QmlObjectSharedEngine *m_osdObject = nullptr; QTimer *m_osdTimer = nullptr; int m_timeout = 0; diff --git a/shell/osd.cpp b/shell/osd.cpp --- a/shell/osd.cpp +++ b/shell/osd.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include Osd::Osd(KSharedConfig::Ptr config, ShellCorona *corona) @@ -167,7 +167,7 @@ } if (!m_osdObject) { - m_osdObject = new KDeclarative::QmlObject(this); + m_osdObject = new KDeclarative::QmlObjectSharedEngine(this); } m_osdObject->setSource(m_osdUrl); diff --git a/shell/shellcorona.h b/shell/shellcorona.h --- a/shell/shellcorona.h +++ b/shell/shellcorona.h @@ -45,7 +45,7 @@ namespace KDeclarative { - class QmlObject; + class QmlObjectSharedEngine; } // namespace KDeclarative namespace KScreen { @@ -241,7 +241,7 @@ QMenu *m_addPanelsMenu; KPackage::Package m_lookAndFeelPackage; QSet m_redundantOutputs; - KDeclarative::QmlObject *m_interactiveConsole; + KDeclarative::QmlObjectSharedEngine *m_interactiveConsole; QTimer m_waitingPanelsTimer; QTimer m_appConfigSyncTimer; diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include @@ -815,7 +815,7 @@ return; } - KDeclarative::QmlObject *qmlObj = new KDeclarative::QmlObject(this); + auto *qmlObj = new KDeclarative::QmlObjectSharedEngine(this); qmlObj->setInitializationDelayed(true); qmlObj->setSource(alternativesQML); @@ -1414,7 +1414,7 @@ return; } - m_interactiveConsole = new KDeclarative::QmlObject(this); + m_interactiveConsole = new KDeclarative::QmlObjectSharedEngine(this); m_interactiveConsole->setInitializationDelayed(true); m_interactiveConsole->setSource(consoleQML);