From c19627b492e70206883fb3b52c4268a97a1e080c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= Date: Wed, 7 Nov 2018 22:15:17 +0100 Subject: [PATCH] Copy plastik window decoration to build directory Summary: This ensures that DontCrashAuroraeDestroyDecoTest can load the plastik window decoration when run from build directory as it happens on build.kde.org. Test Plan: Test passes now when manipulating XDG_DATA_DIRS to hide system install Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16745 --- autotests/integration/dont_crash_aurorae_destroy_deco.cpp | 1 + plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp index 811728e2af..440660da4f 100644 --- a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp +++ b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp @@ -54,6 +54,7 @@ void DontCrashAuroraeDestroyDecoTest::initTestCase() if (!QFile::exists(QStringLiteral("/dev/dri/card0"))) { QSKIP("Needs a dri device"); } + qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); qRegisterMetaType(); qRegisterMetaType(); QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated); diff --git a/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt b/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt index 8e65521a95..2699d64bcd 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt +++ b/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt @@ -6,3 +6,5 @@ install(DIRECTORY package/ install(FILES package/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_decoration_qml_plastik.desktop) + +file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/decorations/kwin4_decoration_qml_plastik)