From b92ea05d24a65bf4d829ac3565f5579df51ec4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Wed, 11 Jan 2012 01:36:30 +0100 Subject: [PATCH] Proper fix for RoundShadow reference error: - RoundShadow has to go into private/ subdirectory - Copy ButtonShadow from desktop components as well, it's needed at runtime --- declarativeimports/plasmacomponents/CMakeLists.txt | 1 + .../plasmacomponents/platformcomponents/touch/ToolButton.qml | 2 +- .../platformcomponents/touch/{ => private}/RoundShadow.qml | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename declarativeimports/plasmacomponents/platformcomponents/touch/{ => private}/RoundShadow.qml (100%) diff --git a/declarativeimports/plasmacomponents/CMakeLists.txt b/declarativeimports/plasmacomponents/CMakeLists.txt index a9f951288..23412e54c 100644 --- a/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/declarativeimports/plasmacomponents/CMakeLists.txt @@ -62,6 +62,7 @@ install(FILES qml/ToolBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/ #Now install the private stuff! +install(FILES qml/private/ButtonShadow.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private) install(FILES qml/private/DualStateButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private) install(FILES qml/private/IconLoader.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private) install(FILES qml/private/PageStack.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private) diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml index 633c016e3..072730a68 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml @@ -144,7 +144,7 @@ Item { property int right: 8 property int bottom: 8 } - RoundShadow { + Private.RoundShadow { anchors.fill: parent state: (internal.userPressed || checked) ? "hidden" : "shadow" } diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/RoundShadow.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml similarity index 100% rename from declarativeimports/plasmacomponents/platformcomponents/touch/RoundShadow.qml rename to declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml