QmlDesigner: remove QtQuick.Controls 1 leftovers

Change-Id: Iec028fb3e3803dae21d67b40a1d04dec399fba04
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

22 files changed, 12 insertions, 320 deletions

diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo
index 98f28e64260..439be25babd 100644
--- a/src/plugins/qmldesigner/componentsplugin/components.metainfo
+++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo
@@ -1,235 +1,4 @@
 MetaInfo {
-
-    Type {
-        name: "QtQuick.Controls.Button"
-        icon: ":/componentsplugin/images/button16.png"
-
-        ItemLibraryEntry {
-            name: "Button"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/button.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "text"; type: "binding"; value: "qsTr(\"Button\")"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.SpinBox"
-        icon: ":/componentsplugin/images/window16.png"
-
-        ItemLibraryEntry {
-            name: "SpinBox"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.CheckBox"
-        icon: ":/componentsplugin/images/checkbox16.png"
-
-        ItemLibraryEntry {
-            name: "Check Box"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/checkbox.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "text"; type: "binding"; value: "qsTr(\"Check Box\")"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.RadioButton"
-        icon: ":/componentsplugin/images/radiobutton16.png"
-
-        ItemLibraryEntry {
-            name: "Radio Button"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/radiobutton.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Button\")"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.ComboBox"
-        icon: ":/componentsplugin/images/combobox16.png"
-
-        ItemLibraryEntry {
-            name: "Combo Box"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/combobox.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.Label"
-        icon: ":/componentsplugin/images/label16.png"
-
-        ItemLibraryEntry {
-            name: "Label"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/label.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "text"; type: "binding"; value: "qsTr(\"Label\")"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.TextField"
-        icon: ":/componentsplugin/images/textfield16.png"
-
-        ItemLibraryEntry {
-            name: "Text Field"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/textfield.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Field\")"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.TextArea"
-        icon: ":/componentsplugin/images/textarea16.png"
-
-        ItemLibraryEntry {
-            name: "Text Area"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/textarea.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.ProgressBar"
-        icon: ":/componentsplugin/images/progressbar16.png"
-
-        ItemLibraryEntry {
-            name: "Progress Bar"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/progressbar.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.Slider"
-        icon: ":/componentsplugin/images/slider16.png"
-
-        ItemLibraryEntry {
-            name: "Slider (Horizontal)"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/slider.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-        }
-
-        ItemLibraryEntry {
-           name: "Slider (Vertical)"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/slider.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-            Property { name: "orientation"; type: "Enumeration"; value: "Qt.Vertical"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.ScrollArea"
-        icon: ":/componentsplugin/images/window16.png"
-
-        ItemLibraryEntry {
-            name: "Scroll Area"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "width"; type: "int"; value: 360; }
-            Property { name: "height"; type: "int"; value: 300; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.GroupBox"
-        icon: ":/componentsplugin/images/window16.png"
-
-        ItemLibraryEntry {
-            name: "Group Box"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "width"; type: "int"; value: 360; }
-            Property { name: "height"; type: "int"; value: 300; }
-
-            Property { name: "title"; type: "binding"; value: "qsTr(\"Group Box\")"; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.Frame"
-        icon: ":/componentsplugin//images/window16.png"
-
-        ItemLibraryEntry {
-            name: "Frame"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "width"; type: "int"; value: 360; }
-            Property { name: "height"; type: "int"; value: 300; }
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.ToolButton"
-        icon: ":/componentsplugin/images/button16.png"
-
-        ItemLibraryEntry {
-            name: "Tool Button"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/button.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-
-        }
-    }
-
-    Type {
-        name: "QtQuick.Controls.Dial"
-        //icon: ":/componentsplugin/images/progressbar16.png"
-
-        ItemLibraryEntry {
-            name: "Dial"
-            category: "Qt Quick - Controls"
-            //libraryIcon: ":/componentsplugin/images/progressbar.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "width"; type: "int"; value: 100; }
-            Property { name: "height"; type: "int"; value: 100; }
-        }
-    }
-
     Type {
         name: "QtQuick.Layouts.RowLayout"
         icon: ":/componentsplugin/images/row-layouts-icon-16px.png"
@@ -294,81 +63,24 @@ MetaInfo {
         }
     }
 
-Type {
-    name: "QtQuick.Layouts.StackLayout"
-    icon: ":/componentsplugin/images/stack-layouts-icon-16px.png"
-
-    Hints {
-        isStackedContainer: true
-        indexPropertyForStackedContainer: "currentIndex"
-    }
-
-    ItemLibraryEntry {
-        name: "StackLayout"
-        category: "Qt Quick - Layouts"
-        libraryIcon: ":/componentsplugin/images/stack-layouts-icon.png"
-        version: "1.3"
-        requiredImport: "QtQuick.Layouts"
-
-        Property { name: "width"; type: "int"; value: 100; }
-        Property { name: "height"; type: "int"; value: 100; }
-    }
-}
-
-    Type {
-        name: "QtQuick.Controls.TabView"
-        icon: ":/componentsplugin/images/window16.png"
-
-        ItemLibraryEntry {
-            name: "Tab View"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-
-            Property { name: "width"; type: "int"; value: 360; }
-            Property { name: "height"; type: "int"; value: 300; }
-        }
-    }
-
     Type {
-        name: "QtQuick.Controls.Calendar"
-        icon: ":/componentsplugin/images/window16.png"
+        name: "QtQuick.Layouts.StackLayout"
+        icon: ":/componentsplugin/images/stack-layouts-icon-16px.png"
 
-        ItemLibraryEntry {
-            name: "Calendar"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
+        Hints {
+            isStackedContainer: true
+            indexPropertyForStackedContainer: "currentIndex"
         }
-    }
-
-    Type {
-        name: "QtQuick.Controls.TableView"
-        icon: ":/componentsplugin/images/window16.png"
 
         ItemLibraryEntry {
-            name: "TableView"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.0"
-            requiredImport: "QtQuick.Controls"
-        }
-    }
-
-
-    Type {
-        name: "QtQuick.Controls.TreeView"
-        icon: ":/componentsplugin/images/window16.png"
+            name: "StackLayout"
+            category: "Qt Quick - Layouts"
+            libraryIcon: ":/componentsplugin/images/stack-layouts-icon.png"
+            version: "1.3"
+            requiredImport: "QtQuick.Layouts"
 
-        ItemLibraryEntry {
-            name: "TreeView"
-            category: "Qt Quick - Controls"
-            libraryIcon: ":/componentsplugin/images/window.png"
-            version: "1.4"
-            requiredImport: "QtQuick.Controls"
+            Property { name: "width"; type: "int"; value: 100; }
+            Property { name: "height"; type: "int"; value: 100; }
         }
     }
-
 }
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
index 0ca65a79487..e1955bcc344 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
@@ -1,28 +1,8 @@
 <RCC>
     <qresource prefix="/componentsplugin">
         <file>components.metainfo</file>
-        <file>images/button.png</file>
-        <file>images/button16.png</file>
-        <file>images/checkbox.png</file>
-        <file>images/checkbox16.png</file>
-        <file>images/combobox.png</file>
-        <file>images/combobox16.png</file>
         <file>images/item-icon.png</file>
         <file>images/item-icon16.png</file>
-        <file>images/progressbar.png</file>
-        <file>images/progressbar16.png</file>
-        <file>images/radiobutton.png</file>
-        <file>images/radiobutton16.png</file>
-        <file>images/slider.png</file>
-        <file>images/slider16.png</file>
-        <file>images/label.png</file>
-        <file>images/label16.png</file>
-        <file>images/textarea.png</file>
-        <file>images/textarea16.png</file>
-        <file>images/textfield.png</file>
-        <file>images/textfield16.png</file>
-        <file>images/window.png</file>
-        <file>images/window16.png</file>
         <file>images/column-layouts-icon.png</file>
         <file>images/column-layouts-icon-16px.png</file>
         <file>images/grid-layouts-icon.png</file>
diff --git a/src/plugins/qmldesigner/componentsplugin/images/button.png b/src/plugins/qmldesigner/componentsplugin/images/button.png
deleted file mode 100644
index da994e512a4..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/button.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/button16.png b/src/plugins/qmldesigner/componentsplugin/images/button16.png
deleted file mode 100644
index 9d0d3f69ac6..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/button16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/checkbox.png b/src/plugins/qmldesigner/componentsplugin/images/checkbox.png
deleted file mode 100644
index 32f1efe09c2..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/checkbox.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png b/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png
deleted file mode 100644
index 5b00d5536f6..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/checkbox16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/combobox.png b/src/plugins/qmldesigner/componentsplugin/images/combobox.png
deleted file mode 100644
index e1993cc9700..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/combobox.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/combobox16.png b/src/plugins/qmldesigner/componentsplugin/images/combobox16.png
deleted file mode 100644
index b0a536ebb79..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/combobox16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/label.png b/src/plugins/qmldesigner/componentsplugin/images/label.png
deleted file mode 100644
index bc4cea17389..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/label.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/label16.png b/src/plugins/qmldesigner/componentsplugin/images/label16.png
deleted file mode 100644
index 236ad9b1583..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/label16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/progressbar.png b/src/plugins/qmldesigner/componentsplugin/images/progressbar.png
deleted file mode 100644
index b137ef7beb1..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/progressbar.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png b/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png
deleted file mode 100644
index 60da065fc13..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/progressbar16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png b/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png
deleted file mode 100644
index 7e3c28d5f4b..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/radiobutton.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png b/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png
deleted file mode 100644
index 38fd6eb0b2d..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/radiobutton16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/slider.png b/src/plugins/qmldesigner/componentsplugin/images/slider.png
deleted file mode 100644
index a3bcd2cd6c5..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/slider.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/slider16.png b/src/plugins/qmldesigner/componentsplugin/images/slider16.png
deleted file mode 100644
index 9b71fa55d64..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/slider16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/textarea.png b/src/plugins/qmldesigner/componentsplugin/images/textarea.png
deleted file mode 100644
index 55a0c40d6b3..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/textarea.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/textarea16.png b/src/plugins/qmldesigner/componentsplugin/images/textarea16.png
deleted file mode 100644
index 647517a1ad8..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/textarea16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/textfield.png b/src/plugins/qmldesigner/componentsplugin/images/textfield.png
deleted file mode 100644
index d9f6ff03c7f..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/textfield.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/textfield16.png b/src/plugins/qmldesigner/componentsplugin/images/textfield16.png
deleted file mode 100644
index ced8ee86f90..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/textfield16.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/window.png b/src/plugins/qmldesigner/componentsplugin/images/window.png
deleted file mode 100644
index fc53d38ae7f..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/window.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/componentsplugin/images/window16.png b/src/plugins/qmldesigner/componentsplugin/images/window16.png
deleted file mode 100644
index 7d2d7a50502..00000000000
--- a/src/plugins/qmldesigner/componentsplugin/images/window16.png
+++ /dev/null