diff --git a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp index 647a50a837..541d63c369 100644 --- a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp +++ b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp @@ -8,10 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "composite.h" #include "core/output.h" -#include "core/renderbackend.h" -#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland_server.h" #include "workspace.h" @@ -66,8 +63,6 @@ void DontCrashAuroraeDestroyDecoTest::initTestCase() QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024)); QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024)); setenv("QT_QPA_PLATFORM", "wayland", true); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void DontCrashAuroraeDestroyDecoTest::init() diff --git a/autotests/integration/dont_crash_empty_deco.cpp b/autotests/integration/dont_crash_empty_deco.cpp index bc00cbc04d..05acf536f2 100644 --- a/autotests/integration/dont_crash_empty_deco.cpp +++ b/autotests/integration/dont_crash_empty_deco.cpp @@ -8,10 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "composite.h" #include "core/output.h" -#include "core/renderbackend.h" -#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland_server.h" #include "workspace.h" @@ -58,8 +55,6 @@ void DontCrashEmptyDecorationTest::initTestCase() QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024)); QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024)); setenv("QT_QPA_PLATFORM", "wayland", true); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void DontCrashEmptyDecorationTest::init() diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp index 1584a35a65..d56bd4d18d 100644 --- a/autotests/integration/dont_crash_reinitialize_compositor.cpp +++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp @@ -11,7 +11,6 @@ #include "composite.h" #include "core/output.h" -#include "core/renderbackend.h" #include "effectloader.h" #include "effects.h" #include "wayland_server.h" @@ -72,8 +71,6 @@ void DontCrashReinitializeCompositorTest::initTestCase() QCOMPARE(outputs.count(), 2); QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024)); QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024)); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void DontCrashReinitializeCompositorTest::init() diff --git a/autotests/integration/effects/desktop_switching_animation_test.cpp b/autotests/integration/effects/desktop_switching_animation_test.cpp index cad4737934..56964fbc3d 100644 --- a/autotests/integration/effects/desktop_switching_animation_test.cpp +++ b/autotests/integration/effects/desktop_switching_animation_test.cpp @@ -9,8 +9,6 @@ #include "kwin_wayland_test.h" -#include "composite.h" -#include "core/renderbackend.h" #include "effectloader.h" #include "effects.h" #include "virtualdesktops.h" @@ -67,8 +65,6 @@ void DesktopSwitchingAnimationTest::initTestCase() kwinApp()->start(); QVERIFY(applicationStartedSpy.wait()); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void DesktopSwitchingAnimationTest::init() diff --git a/autotests/integration/effects/minimize_animation_test.cpp b/autotests/integration/effects/minimize_animation_test.cpp index 0be5914820..76d575bdda 100644 --- a/autotests/integration/effects/minimize_animation_test.cpp +++ b/autotests/integration/effects/minimize_animation_test.cpp @@ -9,8 +9,6 @@ #include "kwin_wayland_test.h" -#include "composite.h" -#include "core/renderbackend.h" #include "effectloader.h" #include "effects.h" #include "wayland_server.h" @@ -67,8 +65,6 @@ void MinimizeAnimationTest::initTestCase() kwinApp()->start(); QVERIFY(applicationStartedSpy.wait()); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void MinimizeAnimationTest::init() diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp index b084d85933..37487ad8d5 100644 --- a/autotests/integration/effects/scripted_effects_test.cpp +++ b/autotests/integration/effects/scripted_effects_test.cpp @@ -9,9 +9,6 @@ #include "kwin_wayland_test.h" -#include "composite.h" -#include "core/renderbackend.h" -#include "cursor.h" #include "effectloader.h" #include "effects.h" #include "libkwineffects/anidata_p.h" @@ -149,9 +146,6 @@ void ScriptedEffectsTest::initTestCase() qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); kwinApp()->start(); QVERIFY(applicationStartedSpy.wait()); - QVERIFY(Compositor::self()); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); KWin::VirtualDesktopManager::self()->setCount(2); } diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp index b57997e2e5..26d5e4b3e9 100644 --- a/autotests/integration/effects/slidingpopups_test.cpp +++ b/autotests/integration/effects/slidingpopups_test.cpp @@ -6,9 +6,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "composite.h" -#include "core/renderbackend.h" -#include "cursor.h" #include "effectloader.h" #include "effects.h" #include "kwin_wayland_test.h" @@ -78,9 +75,6 @@ void SlidingPopupsTest::initTestCase() qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); kwinApp()->start(); QVERIFY(applicationStartedSpy.wait()); - QVERIFY(Compositor::self()); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void SlidingPopupsTest::init() diff --git a/autotests/integration/effects/toplevel_open_close_animation_test.cpp b/autotests/integration/effects/toplevel_open_close_animation_test.cpp index e71ebbbabf..932c0c9e30 100644 --- a/autotests/integration/effects/toplevel_open_close_animation_test.cpp +++ b/autotests/integration/effects/toplevel_open_close_animation_test.cpp @@ -9,8 +9,6 @@ #include "kwin_wayland_test.h" -#include "composite.h" -#include "core/renderbackend.h" #include "effectloader.h" #include "effects.h" #include "wayland_server.h" @@ -68,8 +66,6 @@ void ToplevelOpenCloseAnimationTest::initTestCase() kwinApp()->start(); QVERIFY(applicationStartedSpy.wait()); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void ToplevelOpenCloseAnimationTest::init() diff --git a/autotests/integration/effects/wobbly_shade_test.cpp b/autotests/integration/effects/wobbly_shade_test.cpp index d6be0dcfe3..7db2571b03 100644 --- a/autotests/integration/effects/wobbly_shade_test.cpp +++ b/autotests/integration/effects/wobbly_shade_test.cpp @@ -8,8 +8,6 @@ */ #include "kwin_wayland_test.h" -#include "composite.h" -#include "core/renderbackend.h" #include "cursor.h" #include "effectloader.h" #include "effects.h" @@ -71,9 +69,6 @@ void WobblyWindowsShadeTest::initTestCase() qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); kwinApp()->start(); QVERIFY(applicationStartedSpy.wait()); - QVERIFY(Compositor::self()); - - QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing); } void WobblyWindowsShadeTest::init()