From a280cccfde66d9019f16493aa2eb82b4a42ca14c Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Wed, 10 Apr 2019 06:52:45 +0900
Subject: [PATCH] Revert "mov the mobile text actions in own import"

This reverts commit c72ee78bbbc47c30ebabf03c7e99394dcf87779c.

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
---
 src/declarativeimports/plasmacomponents3/ComboBox.qml          | 3 +--
 src/declarativeimports/plasmacomponents3/TextArea.qml          | 3 +--
 src/declarativeimports/plasmacomponents3/TextField.qml         | 3 +--
 .../plasmacomponents3/mobiletextselection/qmldir               | 3 ---
 .../{mobiletextselection => private}/MobileCursor.qml          | 0
 .../MobileTextActionsToolBar.qml                               | 3 ++-
 src/declarativeimports/plasmacomponents3/private/qmldir        | 2 ++
 7 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir
 rename src/declarativeimports/plasmacomponents3/{mobiletextselection => private}/MobileCursor.qml (100%)
 rename src/declarativeimports/plasmacomponents3/{mobiletextselection => private}/MobileTextActionsToolBar.qml (98%)

diff --git a/src/declarativeimports/plasmacomponents3/ComboBox.qml b/src/declarativeimports/plasmacomponents3/ComboBox.qml
index fdd0fce0c..b82157cfa 100644
--- a/src/declarativeimports/plasmacomponents3/ComboBox.qml
+++ b/src/declarativeimports/plasmacomponents3/ComboBox.qml
@@ -25,7 +25,6 @@ import QtGraphicalEffects 1.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.5 as Kirigami
 import "private" as Private
-import "mobiletextselection" as MobileTextSelection
 
 T.ComboBox {
     id: control
@@ -155,7 +154,7 @@ T.ComboBox {
             opacity: control.enabled ? 1 : 0.3
             onFocusChanged: {
                 if (focus) {
-                    MobileTextSelection.MobileTextActionsToolBar.controlRoot = textField;
+                    Private.MobileTextActionsToolBar.controlRoot = textField;
                 }
             }
 
diff --git a/src/declarativeimports/plasmacomponents3/TextArea.qml b/src/declarativeimports/plasmacomponents3/TextArea.qml
index 7585892c1..d0b23de5f 100644
--- a/src/declarativeimports/plasmacomponents3/TextArea.qml
+++ b/src/declarativeimports/plasmacomponents3/TextArea.qml
@@ -24,7 +24,6 @@ import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 import org.kde.kirigami 2.5 as Kirigami
-import "mobiletextselection" as MobileTextSelection
 
 T.TextArea {
     id: control
@@ -79,7 +78,7 @@ T.TextArea {
 
     onFocusChanged: {
         if (focus) {
-            MobileTextSelection.MobileTextActionsToolBar.controlRoot = control;
+            Private.MobileTextActionsToolBar.controlRoot = control;
         }
     }
 
diff --git a/src/declarativeimports/plasmacomponents3/TextField.qml b/src/declarativeimports/plasmacomponents3/TextField.qml
index aa501bd67..adcab1141 100644
--- a/src/declarativeimports/plasmacomponents3/TextField.qml
+++ b/src/declarativeimports/plasmacomponents3/TextField.qml
@@ -24,7 +24,6 @@ import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 import org.kde.kirigami 2.5 as Kirigami
-import "mobiletextselection" as MobileTextSelection
 
 T.TextField {
     id: control
@@ -58,7 +57,7 @@ T.TextField {
     }
     onFocusChanged: {
         if (focus) {
-            MobileTextSelection.MobileTextActionsToolBar.controlRoot = control;
+            Private.MobileTextActionsToolBar.controlRoot = control;
         }
     }
 
diff --git a/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir b/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir
deleted file mode 100644
index 7b5d9be27..000000000
--- a/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
- 
-singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml
-MobileCursor 1.0 MobileCursor.qml
diff --git a/src/declarativeimports/plasmacomponents3/mobiletextselection/MobileCursor.qml b/src/declarativeimports/plasmacomponents3/private/MobileCursor.qml
similarity index 100%
rename from src/declarativeimports/plasmacomponents3/mobiletextselection/MobileCursor.qml
rename to src/declarativeimports/plasmacomponents3/private/MobileCursor.qml
diff --git a/src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml b/src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml
similarity index 98%
rename from src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml
rename to src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml
index 9b14748da..d4df4f1c8 100644
--- a/src/declarativeimports/plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml
+++ b/src/declarativeimports/plasmacomponents3/private/MobileTextActionsToolBar.qml
@@ -23,6 +23,7 @@ import QtQuick 2.1
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
 import QtQuick.Controls @QQC2_VERSION@
+import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.5 as Kirigami
 
 Popup {
@@ -80,4 +81,4 @@ Popup {
         }
     }
 }
-
+    
diff --git a/src/declarativeimports/plasmacomponents3/private/qmldir b/src/declarativeimports/plasmacomponents3/private/qmldir
index d91a06928..1a9e8d038 100644
--- a/src/declarativeimports/plasmacomponents3/private/qmldir
+++ b/src/declarativeimports/plasmacomponents3/private/qmldir
@@ -1,5 +1,7 @@
  
+singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml
 ButtonShadow 1.0 ButtonShadow.qml
 DefaultListItemBackground 1.0 DefaultListItemBackground.qml
+MobileCursor 1.0 MobileCursor.qml
 RoundShadow 1.0 RoundShadow.qml
 TextFieldFocus 1.0 TextFieldFocus.qml