From 5740074ea7315af4e5ff796c72d03eb7b4374049 Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Wed, 17 Apr 2024 12:30:24 +0700
Subject: [PATCH] Remove remaining traces

---
 src/qml/CMakeLists.txt         | 11 +++--------
 test/qml/tst_editorwidgets.qml | 10 ++++++----
 test/qml/tst_positioning.qml   |  2 --
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index c2c40ad073..2e8683b3d0 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -30,14 +30,9 @@ file(GLOB qfield_qmlfiles_editorwidgets
 file(GLOB qfield_qmlfiles_theme
      "${CMAKE_SOURCE_DIR}/src/qml/imports/Theme/*.qml")
 
-list(
-  APPEND
-  qfield_qmlfiles
-  ${qfield_qmlfiles_geometryeditors}
-  ${qfield_qmlfiles_editorwidgets}
-  ${qfield_qmlfiles_theme}
-  ${qfield_qmlfiles_theme_extra}
-  ${qfield_qmlfiles_qfieldcontrols})
+list(APPEND qfield_qmlfiles ${qfield_qmlfiles_geometryeditors}
+     ${qfield_qmlfiles_editorwidgets} ${qfield_qmlfiles_theme}
+     ${qfield_qmlfiles_theme_extra})
 
 set_property(TARGET qfield_qml PROPERTY QML_FILES ${qfield_qmlfiles})
 
diff --git a/test/qml/tst_editorwidgets.qml b/test/qml/tst_editorwidgets.qml
index d2c03eb18b..69e0ba3292 100644
--- a/test/qml/tst_editorwidgets.qml
+++ b/test/qml/tst_editorwidgets.qml
@@ -3,26 +3,28 @@ import QtTest 1.0
 
 import org.qfield 1.0
 
-import QFieldControls 1.0
+import Theme 1.0
+
+import "../../src/qml/editorwidgets" as EditorWidgets
 
 TestCase {
     name: "EditorWidgets"
 
-    TextEdit {
+    EditorWidgets.TextEdit {
         id: textEdit
         property var value: 'one'
         property var config: undefined
         property bool isEnabled: true
     }
 
-    Range {
+    EditorWidgets.Range {
         id: range
         property var value: 1
         property var config: undefined
         property bool isEnabled: true
     }
 
-    DateTime {
+    EditorWidgets.DateTime {
         id: dateTime
 
         property var value: '2022-01-01'
diff --git a/test/qml/tst_positioning.qml b/test/qml/tst_positioning.qml
index 153ff7a99c..8121be9b86 100644
--- a/test/qml/tst_positioning.qml
+++ b/test/qml/tst_positioning.qml
@@ -3,8 +3,6 @@ import QtTest 1.0
 
 import org.qfield 1.0
 
-import QFieldControls 1.0
-
 TestCase {
     name: "Positioning"