From fed7a48112398a9998706cd35bf81d9eeac6f1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 12 Feb 2016 15:22:55 +0100 Subject: [PATCH] Revert "[autotest] Let's dare enabling the OpenGL compositor in the tests" This reverts commit 5e21963a3b620a167d9319e992c79a56f19d5bfd. Unfortunately all tests failed on the CI system, so no GL yet :-( --- autotests/wayland/dont_crash_glxgears.cpp | 1 - autotests/wayland/kwin_wayland_test.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/autotests/wayland/dont_crash_glxgears.cpp b/autotests/wayland/dont_crash_glxgears.cpp index cb168f3e1a..3ce7dbed01 100644 --- a/autotests/wayland/dont_crash_glxgears.cpp +++ b/autotests/wayland/dont_crash_glxgears.cpp @@ -43,7 +43,6 @@ private Q_SLOTS: void DontCrashGlxgearsTest::initTestCase() { - qputenv("KWIN_COMPOSE", QByteArrayLiteral("Q")); qRegisterMetaType(); QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated); QVERIFY(workspaceCreatedSpy.isValid()); diff --git a/autotests/wayland/kwin_wayland_test.cpp b/autotests/wayland/kwin_wayland_test.cpp index e5fdd267e9..76b1b9a866 100644 --- a/autotests/wayland/kwin_wayland_test.cpp +++ b/autotests/wayland/kwin_wayland_test.cpp @@ -46,7 +46,7 @@ WaylandTestApplication::WaylandTestApplication(int &argc, char **argv) #ifdef KWIN_BUILD_ACTIVITIES setUseKActivities(false); #endif - qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); + qputenv("KWIN_COMPOSE", QByteArrayLiteral("Q")); WaylandServer *server = WaylandServer::create(this); QPluginLoader loader(QStringLiteral(KWINBACKENDPATH)); loader.instance()->setParent(server);