diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kcmkwin/kwincompositing/CMakeLists.txt @@ -34,6 +34,7 @@ target_link_libraries(kwincompositing Qt5::Quick + Qt5::QuickWidgets Qt5::DBus Qt5::Widgets KF5::CoreAddons @@ -64,6 +65,7 @@ target_link_libraries(effectModelTest Qt5::Quick + Qt5::QuickWidgets Qt5::DBus Qt5::Test Qt5::Widgets diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp --- a/kcmkwin/kwincompositing/main.cpp +++ b/kcmkwin/kwincompositing/main.cpp @@ -229,16 +229,12 @@ { QVBoxLayout *vl = new QVBoxLayout(this); - QWidget *w = QWidget::createWindowContainer(m_view.data(), this); - connect(m_view.data(), &QWindow::minimumWidthChanged, w, &QWidget::setMinimumWidth); - connect(m_view.data(), &QWindow::minimumHeightChanged, w, &QWidget::setMinimumHeight); - w->setMinimumSize(m_view->initialSize()); - vl->addWidget(w); + vl->addWidget(m_view.data()); setLayout(vl); connect(m_view.data(), &KWin::Compositing::EffectView::changed, [this]{ emit changed(true); }); - w->setFocusPolicy(Qt::StrongFocus); + m_view->setFocusPolicy(Qt::StrongFocus); } KWinCompositingKCM::~KWinCompositingKCM() diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h --- a/kcmkwin/kwincompositing/model.h +++ b/kcmkwin/kwincompositing/model.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -114,7 +114,7 @@ }; -class EffectView : public QQuickView +class EffectView : public QQuickWidget { Q_OBJECT @@ -124,7 +124,7 @@ DesktopEffectsView, CompositingSettingsView }; - EffectView(ViewType type, QWindow *parent = 0); + EffectView(ViewType type, QWidget *parent = 0); void save(); void load(); diff --git a/kcmkwin/kwincompositing/model.cpp b/kcmkwin/kwincompositing/model.cpp --- a/kcmkwin/kwincompositing/model.cpp +++ b/kcmkwin/kwincompositing/model.cpp @@ -581,8 +581,8 @@ m_effectModel->defaults(); } -EffectView::EffectView(ViewType type, QWindow *parent) - : QQuickView(parent) +EffectView::EffectView(ViewType type, QWidget *parent) + : QQuickWidget(parent) { qRegisterMetaType(); qmlRegisterType("org.kde.kwin.kwincompositing", 1, 0, "EffectConfig"); @@ -608,7 +608,7 @@ break; } QString mainFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, path, QStandardPaths::LocateFile); - setResizeMode(QQuickView::SizeRootObjectToView); + setResizeMode(QQuickWidget::SizeRootObjectToView); setSource(QUrl(mainFile)); rootObject()->setProperty("color", KColorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)).background(KColorScheme::NormalBackground).color());