alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into editbubble

Browse Source
This commit is contained in:
Sebastian Kügler 2012-01-11 01:38:13 +01:00
commit 9d04bd4938
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
declarativeimports/plasmacomponents/CMakeLists.txt
View File

@ -62,6 +62,7 @@ install(FILES qml/ToolBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/
#Now install the private stuff! #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/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/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) install(FILES qml/private/PageStack.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)

2
declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
View File

@ -144,7 +144,7 @@ Item {
property int right: 8 property int right: 8
property int bottom: 8 property int bottom: 8
} }
RoundShadow { Private.RoundShadow {
anchors.fill: parent anchors.fill: parent
state: (internal.userPressed || checked) ? "hidden" : "shadow" state: (internal.userPressed || checked) ? "hidden" : "shadow"
} }

0
declarativeimports/plasmacomponents/platformcomponents/touch/RoundShadow.qml → declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml
View File