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

Revert "mov the mobile text actions in own import"

Browse Source 
This reverts commit c72ee78bbb.

Broke PlasmaComponents3. Missing files? Error example:

MenuRepresentation.qml:172:5: Type PlasmaComponents3.TextField unavailable
file:///home/eike/devel/install/lib64/qml/org/kde/plasma/components.3/TextField.qml:27:1: "mobiletextselection": no such directory

CCMAIL:notmart@gmail.com
This commit is contained in:
Eike Hein 2019-04-10 06:52:45 +09:00
parent 067ec2eafc
commit a280cccfde
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/declarativeimports/plasmacomponents3/ComboBox.qml
View File

@ -25,7 +25,6 @@ import QtGraphicalEffects 1.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.kirigami 2.5 as Kirigami import org.kde.kirigami 2.5 as Kirigami
import "private" as Private import "private" as Private
import "mobiletextselection" as MobileTextSelection
T.ComboBox { T.ComboBox {
id: control id: control
@ -155,7 +154,7 @@ T.ComboBox {
opacity: control.enabled ? 1 : 0.3 opacity: control.enabled ? 1 : 0.3
onFocusChanged: { onFocusChanged: {
if (focus) { if (focus) {
MobileTextSelection.MobileTextActionsToolBar.controlRoot = textField; Private.MobileTextActionsToolBar.controlRoot = textField;
} }
} }

3
src/declarativeimports/plasmacomponents3/TextArea.qml
View File

@ -24,7 +24,6 @@ import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import "private" as Private import "private" as Private
import org.kde.kirigami 2.5 as Kirigami import org.kde.kirigami 2.5 as Kirigami
import "mobiletextselection" as MobileTextSelection
T.TextArea { T.TextArea {
id: control id: control
@ -79,7 +78,7 @@ T.TextArea {
onFocusChanged: { onFocusChanged: {
if (focus) { if (focus) {
MobileTextSelection.MobileTextActionsToolBar.controlRoot = control; Private.MobileTextActionsToolBar.controlRoot = control;
} }
} }

3
src/declarativeimports/plasmacomponents3/TextField.qml
View File

@ -24,7 +24,6 @@ import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import "private" as Private import "private" as Private
import org.kde.kirigami 2.5 as Kirigami import org.kde.kirigami 2.5 as Kirigami
import "mobiletextselection" as MobileTextSelection
T.TextField { T.TextField {
id: control id: control
@ -58,7 +57,7 @@ T.TextField {
} }
onFocusChanged: { onFocusChanged: {
if (focus) { if (focus) {
MobileTextSelection.MobileTextActionsToolBar.controlRoot = control; Private.MobileTextActionsToolBar.controlRoot = control;
} }
} }

3
src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir
View File

@ -1,3 +0,0 @@
singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml
MobileCursor 1.0 MobileCursor.qml

0
src/declarativeimports/plasmacomponents3/mobiletextselection/MobileCursor.qml → src/declarativeimports/plasmacomponents3/private/MobileCursor.qml
View File

1
src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml → src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml
View File

@ -23,6 +23,7 @@ import QtQuick 2.1
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Controls @QQC2_VERSION@ import QtQuick.Controls @QQC2_VERSION@
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.kirigami 2.5 as Kirigami import org.kde.kirigami 2.5 as Kirigami
Popup { Popup {

2
src/declarativeimports/plasmacomponents3/private/qmldir
View File

@ -1,5 +1,7 @@
singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml
ButtonShadow 1.0 ButtonShadow.qml ButtonShadow 1.0 ButtonShadow.qml
DefaultListItemBackground 1.0 DefaultListItemBackground.qml DefaultListItemBackground 1.0 DefaultListItemBackground.qml
MobileCursor 1.0 MobileCursor.qml
RoundShadow 1.0 RoundShadow.qml RoundShadow 1.0 RoundShadow.qml
TextFieldFocus 1.0 TextFieldFocus.qml TextFieldFocus 1.0 TextFieldFocus.qml