Renamed ImageSettings.qml and VideoSettings.qml to ImageModeSettings.qml and VideoMod...

Prevent clashing with stuff from declarative QtCamera

diff --git a/qml/ImageSettings.qml b/qml/ImageModeSettings.qml
similarity index 100%
rename from qml/ImageSettings.qml
rename to qml/ImageModeSettings.qml

diff --git a/qml/SettingsView.qml b/qml/SettingsView.qml
index 8965fd5..73897d5 100644 (file)
--- a/qml/SettingsView.qml
+++ b/qml/SettingsView.qml
@@ -32,7 +32,7 @@ Item {
     Loader {
         id: loader
         anchors.fill: parent
     Loader {
         id: loader
         anchors.fill: parent

-        source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoSettings.qml") : Qt.resolvedUrl("ImageSettings.qml")
+        source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoModeSettings.qml") : Qt.resolvedUrl("ImageModeSettings.qml")

     }
 
     Binding {
     }
 
     Binding {

diff --git a/qml/VideoSettings.qml b/qml/VideoModeSettings.qml
similarity index 100%
rename from qml/VideoSettings.qml
rename to qml/VideoModeSettings.qml

diff --git a/qml/qml.qrc b/qml/qml.qrc
index 7bf24d2..cfdb470 100644 (file)
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -17,7 +17,7 @@
        <file>ImageOverlay.qml</file>
        <file>ImageResolutionSettings.qml</file>
        <file>ImageSceneButton.qml</file>
        <file>ImageOverlay.qml</file>
        <file>ImageResolutionSettings.qml</file>
        <file>ImageSceneButton.qml</file>

-       <file>ImageSettings.qml</file>
+       <file>ImageModeSettings.qml</file>

        <file>ImageWhiteBalanceButton.qml</file>
        <file>Indicator.qml</file>
         <file>main.qml</file>
        <file>ImageWhiteBalanceButton.qml</file>
        <file>Indicator.qml</file>
         <file>main.qml</file>


@@ -40,7 +40,7 @@
        <file>VideoPlayerPage.qml</file>
        <file>VideoResolutionSettings.qml</file>
        <file>VideoSceneButton.qml</file>
        <file>VideoPlayerPage.qml</file>
        <file>VideoResolutionSettings.qml</file>
        <file>VideoSceneButton.qml</file>

-       <file>VideoSettings.qml</file>
+       <file>VideoModeSettings.qml</file>

        <file>VideoTorchButton.qml</file>
        <file>VideoWhiteBalanceButton.qml</file>
        <file>ZoomCaptureButton.qml</file>
        <file>VideoTorchButton.qml</file>
        <file>VideoWhiteBalanceButton.qml</file>
        <file>ZoomCaptureButton.qml</file>