QmlDesigner.PropertyEditor: Fixing enum scopes

Change-Id: I4f8402b863f929aed90384f119e49302a89c4cd2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

5 files changed, 14 insertions, 2 deletions

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml
index 36722e9465..f7f4a70b61 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml
@@ -91,6 +91,7 @@ Section {
                 backendValue: backendValues.flickableDirection
                 model: ["AutoFlickDirection", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"]
                 Layout.fillWidth: true
+                scope: "Flickable"
             }
 
         }
@@ -105,6 +106,7 @@ Section {
                 backendValue: backendValues.boundsBehavior
                 model: ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"]
                 Layout.fillWidth: true
+                scope: "Flickable"
             }
 
         }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
index 89f187cf8b..b46ad16721 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
@@ -107,9 +107,10 @@ Column {
 
             SecondColumnLayout {
                 ComboBox {
-                    model: ["LeftToRight", "TopToBottom"]
+                    model: ["FlowLeftToRight", "FlowTopToBottom"]
                     backendValue: backendValues.flow
                     Layout.fillWidth: true
+                    scope: "GridView"
                 }
             }
 
@@ -137,6 +138,7 @@ Column {
                     model: ["LeftToRight", "RightToLeft"]
                     backendValue: backendValues.layoutDirection
                     Layout.fillWidth: true
+                    scope: "Qt"
                 }
             }
 
@@ -150,6 +152,7 @@ Column {
                     model: ["NoSnap", "SnapToRow", "SnapOneRow"]
                     backendValue: backendValues.snapMode
                     Layout.fillWidth: true
+                    scope: "GridView"
                 }
             }
 
@@ -173,6 +176,7 @@ Column {
                     model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
                     backendValue: backendValues.highlightRangeMode
                     Layout.fillWidth: true
+                    scope: "GridView"
                 }
             }
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
index 00650d6ebf..0f520d01f3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
@@ -90,6 +90,7 @@ Column {
                     model: ["Horizontal", "Vertical"]
                     backendValue: backendValues.orientation
                     Layout.fillWidth: true
+                    scope: "ListView"
                 }
 
             }
@@ -102,6 +103,7 @@ Column {
                 ComboBox {
                     model: ["LeftToRight", "RightToLeft"]
                     backendValue: backendValues.layoutDirection
+                    scope: "Qt"
                 }
 
                 ExpandingSpacer {
@@ -116,8 +118,9 @@ Column {
 
             SecondColumnLayout {
                 ComboBox {
-                    model: ["NoSnap", "SnapToRow", "SnapOneRow"]
+                    model: ["NoSnap", "SnapToItem", "SnapOneItem"]
                     backendValue: backendValues.snapMode
+                    scope: "ListView"
                 }
 
                 ExpandingSpacer {
@@ -163,6 +166,7 @@ Column {
                     model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
                     backendValue: backendValues.highlightRangeMode
                     Layout.fillWidth: true
+                    scope: "ListView"
                 }
 
                 ExpandingSpacer {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml
index 1f56b346ab..db5e6e8038 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml
@@ -146,6 +146,7 @@ Column {
                     model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
                     backendValue: backendValues.highlightRangeMode
                     Layout.fillWidth: true
+                    scope: "PathView"
                 }
 
                 ExpandingSpacer {
diff --git a/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml b/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml
index 9a1268a182..14e993bfbf 100644
--- a/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml
+++ b/src/plugins/qmldesigner/componentsplugin/Controls/TextFieldSpecifics.qml
@@ -127,6 +127,7 @@ Column {
                     backendValue: backendValues.echoMode
                     implicitWidth: 180
                     model:  ["Normal", "Password", "PasswordEchoOnEdit", "NoEcho"]
+                    scope: "TextInput"
                 }
                 ExpandingSpacer {