Post Qt5 retirement follow ups

opengisch · Apr 17, 2024 · 328598a · 328598a
1 parent e456435
commit 328598a
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 26 deletions.
diff --git a/...qml/imports/QFieldControls/CodeReader.qml → src/qml/CodeReader.qml b/...qml/imports/QFieldControls/CodeReader.qml → src/qml/CodeReader.qml
diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -10,7 +10,6 @@ import QtWebView 1.14
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 Page {
   id: form

diff --git a/src/qml/FeatureListForm.qml b/src/qml/FeatureListForm.qml
@@ -24,7 +24,6 @@ import QtQuick.Controls.Material.impl 2.14
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 Rectangle {
   id: featureForm

diff --git a/...ts/QFieldControls/QFieldAudioRecorder.qml → src/qml/QFieldAudioRecorder.qml b/...ts/QFieldControls/QFieldAudioRecorder.qml → src/qml/QFieldAudioRecorder.qml
diff --git a/...l/imports/QFieldControls/QFieldCamera.qml → src/qml/QFieldCamera.qml b/...l/imports/QFieldControls/QFieldCamera.qml → src/qml/QFieldCamera.qml
diff --git a/src/qml/TemporalProperties.qml b/src/qml/TemporalProperties.qml
@@ -5,7 +5,6 @@ import QtQuick.Layouts 1.14
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 Popup {
     id: popup
@@ -155,7 +154,7 @@ Popup {
         }
     }
 
-    CalendarPanel {
+    QfCalendarPanel {
         id: calendarPanel
 
         property string temporalField: ''

diff --git a/src/qml/editorwidgets/DateTime.qml b/src/qml/editorwidgets/DateTime.qml
@@ -4,7 +4,6 @@ import QtQuick.Layouts 1.14
 
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 import "."
 import ".."
@@ -230,7 +229,7 @@ EditorWidgetBase {
     font: label.font
   }
 
-  CalendarPanel {
+  QfCalendarPanel {
     id: calendarPanel
     isDateTime: !main.fieldIsDate
     onDateTimePicked: {

diff --git a/src/qml/editorwidgets/ExternalResource.qml b/src/qml/editorwidgets/ExternalResource.qml
@@ -7,7 +7,6 @@ import QtMultimedia
 import org.qgis 1.0
 import org.qfield 1.0
 import Theme 1.0
-import QFieldControls 1.0
 
 import "."
 import ".."

diff --git a/src/qml/imports/QFieldControls/qmldir b/src/qml/imports/QFieldControls/qmldir
diff --git a/.../imports/QFieldControls/CalendarPanel.qml → src/qml/imports/Theme/QfCalendarPanel.qml b/.../imports/QFieldControls/CalendarPanel.qml → src/qml/imports/Theme/QfCalendarPanel.qml
diff --git a/src/qml/imports/Theme/qmldir b/src/qml/imports/Theme/qmldir
@@ -10,3 +10,4 @@ QfTextField 1.0 QfTextField.qml
 QfCollapsibleMessage 1.0 QfCollapsibleMessage.qml
 QfDropShadow 1.0 QfDropShadow.qml
 QfOpacityMask 1.0 QfOpacityMask.qml
+QfCalendarPanel 1.0 QfCalendarPanel.qml
diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -27,7 +27,6 @@ import org.qgis 1.0
 import org.qfield 1.0
 
 import Theme 1.0
-import QFieldControls 1.0
 
 ApplicationWindow {
   id: mainWindow

diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
@@ -8,6 +8,7 @@
         <file>BookmarkRenderer.qml</file>
         <file>BrowserPanel.qml</file>
         <file>BusyOverlay.qml</file>
+        <file>CodeReader.qml</file>
         <file>ConfirmationToolbar.qml</file>
         <file>CoordinateLocator.qml</file>
         <file>DashBoard.qml</file>
@@ -28,6 +29,8 @@
         <file>PositioningSettings.qml</file>
         <file>PositioningInformationView.qml</file>
         <file>PositioningPreciseView.qml</file>
+        <file>QFieldAudioRecorder.qml</file>
+        <file>QFieldCamera.qml</file>
         <file>QFieldSettings.qml</file>
         <file>ScaleBar.qml</file>
         <file>SensorInformationView.qml</file>
@@ -81,12 +84,9 @@
         <file>imports/Theme/QfSwitch.qml</file>
         <file>imports/Theme/QfTextField.qml</file>
         <file>imports/Theme/QfCollapsibleMessage.qml</file>
+        <file>imports/Theme/QfSlider.qml</file>
+        <file>imports/Theme/QfCalendarPanel.qml</file>
         <file>imports/Theme/qmldir</file>
-        <file>imports/QFieldControls/qmldir</file>
-        <file>imports/QFieldControls/CodeReader.qml</file>
-        <file>imports/QFieldControls/CalendarPanel.qml</file>
-        <file>imports/QFieldControls/QFieldAudioRecorder.qml</file>
-        <file>imports/QFieldControls/QFieldCamera.qml</file>
         <file>PageHeader.qml</file>
         <file>TrackerSettings.qml</file>
         <file>TrackingSession.qml</file>
@@ -101,6 +101,5 @@
         <file>QFieldCloudPackageLayersFeedback.qml</file>
         <file>QFieldLocalDataPickerScreen.qml</file>
         <file>QFieldSketcher.qml</file>
-        <file>imports/Theme/QfSlider.qml</file>
     </qresource>
 </RCC>
diff --git a/src/qml/qmlqt6.qrc b/src/qml/qmlqt6.qrc