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

Disable KDeclarative in PresentWindows and DesktopGrid

Browse source 
QML code needs porting to QtQuick2
This commit is contained in:
Martin Gräßlin 2013-07-24 08:07:24 +02:00
parent ba7d50fdc5
commit 5e0484bc17
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
effects/desktopgrid/desktopgrid.cpp
View file

@ -1393,10 +1393,13 @@ DesktopButtonsView::DesktopButtonsView(QWidget *parent)
for (const QString &importPath : KGlobal::dirs()->findDirs("module", QStringLiteral("imports"))) { for (const QString &importPath : KGlobal::dirs()->findDirs("module", QStringLiteral("imports"))) {
engine()->addImportPath(importPath); engine()->addImportPath(importPath);
} }
#warning Port declarative code to QtQuick2
#if KWIN_QT5_PORTING
KDeclarative kdeclarative; KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(engine()); kdeclarative.setDeclarativeEngine(engine());
kdeclarative.initialize(); kdeclarative.initialize();
kdeclarative.setupBindings(); kdeclarative.setupBindings();
#endif
rootContext()->setContextProperty(QStringLiteral("add"), QVariant(true)); rootContext()->setContextProperty(QStringLiteral("add"), QVariant(true));
rootContext()->setContextProperty(QStringLiteral("remove"), QVariant(true)); rootContext()->setContextProperty(QStringLiteral("remove"), QVariant(true));

3
effects/presentwindows/presentwindows.cpp
View file

@ -1950,10 +1950,13 @@ CloseWindowView::CloseWindowView(QWidget *parent)
for (const QString &importPath : KGlobal::dirs()->findDirs("module", QStringLiteral("imports"))) { for (const QString &importPath : KGlobal::dirs()->findDirs("module", QStringLiteral("imports"))) {
engine()->addImportPath(importPath); engine()->addImportPath(importPath);
} }
#warning Port declarative code to QtQuick2
#if KWIN_QT5_PORTING
KDeclarative kdeclarative; KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(engine()); kdeclarative.setDeclarativeEngine(engine());
kdeclarative.initialize(); kdeclarative.initialize();
kdeclarative.setupBindings(); kdeclarative.setupBindings();
#endif
rootContext()->setContextProperty(QStringLiteral("armed"), QVariant(false)); rootContext()->setContextProperty(QStringLiteral("armed"), QVariant(false));