From bcc26fb73b209557acfb174901bfd7eff8312331 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 22 Dec 2011 14:58:11 +0100 Subject: [PATCH] fix import names --- declarativeimports/plasmacomponents/CMakeLists.txt | 1 + declarativeimports/plasmacomponents/qml/Button.qml | 4 ++-- declarativeimports/plasmacomponents/qml/TextField.qml | 2 +- declarativeimports/plasmacomponents/qml/ToolButton.qml | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/declarativeimports/plasmacomponents/CMakeLists.txt b/declarativeimports/plasmacomponents/CMakeLists.txt index ff28b094d..e59501c20 100644 --- a/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/declarativeimports/plasmacomponents/CMakeLists.txt @@ -60,6 +60,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/qml/Button.qml b/declarativeimports/plasmacomponents/qml/Button.qml index 48611bf55..f21219376 100644 --- a/declarativeimports/plasmacomponents/qml/Button.qml +++ b/declarativeimports/plasmacomponents/qml/Button.qml @@ -136,7 +136,7 @@ Item { internal.clickButton(); } - ButtonShadow { + Private.ButtonShadow { id: shadow anchors.fill: parent state: { @@ -210,7 +210,7 @@ Item { bottomMargin: surfaceNormal.margins.bottom } - IconLoader { + Private.IconLoader { id: icon anchors { diff --git a/declarativeimports/plasmacomponents/qml/TextField.qml b/declarativeimports/plasmacomponents/qml/TextField.qml index e60605c74..a788a837f 100644 --- a/declarativeimports/plasmacomponents/qml/TextField.qml +++ b/declarativeimports/plasmacomponents/qml/TextField.qml @@ -172,7 +172,7 @@ Item { // disabled text fields opacity: enabled ? 1.0 : 0.5 - TextFieldFocus { + Private.TextFieldFocus { id: hover state: textInput.activeFocus ? "focus" : (mouseWatcher.containsMouse ? "hover" : "hidden") anchors.fill: base diff --git a/declarativeimports/plasmacomponents/qml/ToolButton.qml b/declarativeimports/plasmacomponents/qml/ToolButton.qml index cf56c2df8..f36cf56fd 100644 --- a/declarativeimports/plasmacomponents/qml/ToolButton.qml +++ b/declarativeimports/plasmacomponents/qml/ToolButton.qml @@ -141,7 +141,7 @@ Item { } } - ButtonShadow { + Private.ButtonShadow { id: shadow anchors.fill: parent visible: !flat @@ -173,7 +173,7 @@ Item { PropertyAnimation { duration: 250 } } - IconLoader { + Private.IconLoader { id: icon anchors {