Merge pull request #5572 from opengisch/import_remove_version

Remove version numbering from all QML imports
opengisch · Aug 20, 2024 · b49e8ab · b49e8ab
2 parents 0ddc4d7 + acddc66
commit b49e8ab
Show file tree

Hide file tree

Showing 120 changed files with 586 additions and 620 deletions.
diff --git a/src/qml/About.qml b/src/qml/About.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   id: aboutPanel

diff --git a/src/qml/BadLayerItem.qml b/src/qml/BadLayerItem.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Page {
   id: badLayerPage

diff --git a/src/qml/BluetoothDeviceChooser.qml b/src/qml/BluetoothDeviceChooser.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Item {
   width: parent.width

diff --git a/src/qml/BookmarkHighlight.qml b/src/qml/BookmarkHighlight.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import org.qgis
+import org.qfield
+import Theme
 
 Repeater {
   id: bookmarkHighlight

diff --git a/src/qml/BookmarkProperties.qml b/src/qml/BookmarkProperties.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Popup {
   id: bookmarkProperties

diff --git a/src/qml/BookmarkRenderer.qml b/src/qml/BookmarkRenderer.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: bookmarkRenderer

diff --git a/src/qml/BrowserPanel.qml b/src/qml/BrowserPanel.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtWebView 1.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtWebView
+import org.qfield
+import Theme
 
 Popup {
   id: browserPanel
@@ -66,36 +66,22 @@ Popup {
     if (url != '') {
       if (browserView === undefined) {
         // avoid cost of WevView creation until needed
-        if (qVersion >= '6.0.0') {
-          browserView = Qt.createQmlObject('import QtWebView
-            WebView {
-              id: browserView
-              anchors { top: parent.top; left: parent.left; right: parent.right; }
-              onLoadingChanged: {
-                if ( !loading ) {
-                  anchors.fill = parent; width = parent.width
-                  height = parent.height; opacity = 1
-                }
+        browserView = Qt.createQmlObject('import QtWebView
+          WebView {
+            id: browserView
+            anchors { top: parent.top; left: parent.left; right: parent.right; }
+            onLoadingChanged: {
+              if ( !loading ) {
+                anchors.fill = parent; width = parent.width
+                height = parent.height; opacity = 1
               }
-              onCookieAdded: (domain, name) => {
-                browserPanel.browserCookies.push([domain, name])
-              }
-            }', browserContent);
-          if (clearCookiesOnOpen) {
-            browserView.deleteAllCookies();
-          }
-        } else {
-          browserView = Qt.createQmlObject('import QtWebView 1.14
-            WebView {
-              id: browserView
-              anchors { top: parent.top; left: parent.left; right: parent.right; }
-              onLoadingChanged: {
-                if ( !loading ) {
-                  anchors.fill = parent; width = parent.width
-                  height = parent.height; opacity = 1
-                }
-              }
-            }', browserContent);
+            }
+            onCookieAdded: (domain, name) => {
+              browserPanel.browserCookies.push([domain, name])
+            }
+          }', browserContent);
+        if (clearCookiesOnOpen) {
+          browserView.deleteAllCookies();
         }
       }
       browserView.anchors.fill = undefined;

diff --git a/src/qml/BusyOverlay.qml b/src/qml/BusyOverlay.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Rectangle {
   id: busyOverlay

diff --git a/src/qml/Changelog.qml b/src/qml/Changelog.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import Theme 1.0
-import org.qfield 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
 
 Popup {
   id: changelogPopup

diff --git a/src/qml/CodeReader.qml b/src/qml/CodeReader.qml
@@ -4,8 +4,8 @@ import QtQuick.Layouts
 import QtQuick.Shapes
 import QtMultimedia
 import QtCore
-import org.qfield 1.0
-import Theme 1.0
+import org.qfield
+import Theme
 
 Popup {
   id: codeReader

diff --git a/src/qml/ConfirmationToolbar.qml b/src/qml/ConfirmationToolbar.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qgis
+import org.qfield
+import Theme
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: confirmationToolbar
 
   spacing: 4

diff --git a/src/qml/CoordinateLocator.qml b/src/qml/CoordinateLocator.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.14
-import QtQuick.Shapes 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Shapes
+import org.qgis
+import org.qfield
+import Theme
 
 Item {
   id: locator

diff --git a/src/qml/DashBoard.qml b/src/qml/DashBoard.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Layouts 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import org.qgis
+import org.qfield
+import Theme
 
 Drawer {
   id: dashBoard

diff --git a/src/qml/DigitizingToolbar.qml b/src/qml/DigitizingToolbar.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qgis
+import org.qfield
+import Theme
 
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: digitizingToolbar
 
   property RubberbandModel rubberbandModel

diff --git a/src/qml/ElevationProfile.qml b/src/qml/ElevationProfile.qml
@@ -1,9 +1,9 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQml 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: elevationProfile

diff --git a/src/qml/EmbeddedFeatureForm.qml b/src/qml/EmbeddedFeatureForm.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import org.qfield
+import Theme
 
 Popup {
   id: formPopup

diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -1,14 +1,14 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Layouts 1.14
-import QtQml.Models 2.14
-import QtQml 2.14
-import QtCharts 2.14 // Not actually used here but added so the android deploy script adds the relevant package
-import QtWebView 1.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
+import QtQuick.Layouts
+import QtQml.Models
+import QtQml
+import QtCharts
+import QtWebView
+import org.qgis
+import org.qfield
+import Theme
 
 Page {
   id: form
@@ -319,7 +319,7 @@ Page {
 
       onHtmlCodeChanged: {
         if (htmlItem === undefined) {
-          htmlItem = Qt.createQmlObject('import QtWebView 1.14;
+          htmlItem = Qt.createQmlObject('import QtWebView;
             WebView {
               id: htmlItem;
               height: 0;

diff --git a/src/qml/FeatureListForm.qml b/src/qml/FeatureListForm.qml
@@ -14,14 +14,14 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtQuick.Controls.Material 2.14
-import QtQuick.Controls.Material.impl 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import org.qgis
+import org.qfield
+import Theme
 
 Rectangle {
   id: featureFormList

diff --git a/src/qml/FeatureListSelectionHighlight.qml b/src/qml/FeatureListSelectionHighlight.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import org.qgis 1.0
-import org.qfield 1.0
+import QtQuick
+import org.qgis
+import org.qfield
 
 Repeater {
   id: featureListSelectionHighlight

diff --git a/src/qml/GeometryEditorsToolbar.qml b/src/qml/GeometryEditorsToolbar.qml
@@ -1,12 +1,12 @@
-import QtQuick 2.14
-import QtQml.Models 2.14
-import org.qgis 1.0
-import org.qfield 1.0
-import Theme 1.0
+import QtQuick
+import QtQml.Models
+import org.qgis
+import org.qfield
+import Theme
 
 /**
 This contains several geometry editing tools
-A tool must subclass VisibilityFadingRow
+A tool must subclass QfVisibilityFadingRow
 And contains following functions:
   * function init(featureModel, mapSettings, editorRubberbandModel)
   * function cancel()
@@ -22,7 +22,7 @@ It can optionally implement the functions:
   * canvasLongPressed(point)
   These functions must return true if they catch the event
 */
-VisibilityFadingRow {
+QfVisibilityFadingRow {
   id: geometryEditorsToolbar
 
   property FeatureModel featureModel //<! the feature which has its geometry being edited
@@ -100,7 +100,7 @@ VisibilityFadingRow {
       return false;
   }
 
-  VisibilityFadingRow {
+  QfVisibilityFadingRow {
     id: selectorRow
     stateVisible: true
 

diff --git a/src/qml/GeometryHighlighter.qml b/src/qml/GeometryHighlighter.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import org.qfield 1.0
+import QtQuick
+import org.qfield
 
 Item {
   id: geometryHighlighter