From 5e0484bc17c0dc74e02d9bd7aefd2c9187a3effd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 24 Jul 2013 08:07:24 +0200 Subject: [PATCH] Disable KDeclarative in PresentWindows and DesktopGrid QML code needs porting to QtQuick2 --- effects/desktopgrid/desktopgrid.cpp | 3 +++ effects/presentwindows/presentwindows.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index de7d1394a4..81b73e5b97 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -1393,10 +1393,13 @@ DesktopButtonsView::DesktopButtonsView(QWidget *parent) for (const QString &importPath : KGlobal::dirs()->findDirs("module", QStringLiteral("imports"))) { engine()->addImportPath(importPath); } +#warning Port declarative code to QtQuick2 +#if KWIN_QT5_PORTING KDeclarative kdeclarative; kdeclarative.setDeclarativeEngine(engine()); kdeclarative.initialize(); kdeclarative.setupBindings(); +#endif rootContext()->setContextProperty(QStringLiteral("add"), QVariant(true)); rootContext()->setContextProperty(QStringLiteral("remove"), QVariant(true)); diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index e1a59ae892..c682b9a8cb 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -1950,10 +1950,13 @@ CloseWindowView::CloseWindowView(QWidget *parent) for (const QString &importPath : KGlobal::dirs()->findDirs("module", QStringLiteral("imports"))) { engine()->addImportPath(importPath); } +#warning Port declarative code to QtQuick2 +#if KWIN_QT5_PORTING KDeclarative kdeclarative; kdeclarative.setDeclarativeEngine(engine()); kdeclarative.initialize(); kdeclarative.setupBindings(); +#endif rootContext()->setContextProperty(QStringLiteral("armed"), QVariant(false));