.gitignore

 # This file is used to ignore files which are generated in the Qt build system
 # ----------------------------------------------------------------------------
 
-examples/ApplicationTemplate/application
-examples/text/text
+examples/quick/controls/ApplicationTemplate/application
+examples/quick/controls/text/text
 tests/auto/activeFocusOnTab/tst_activeFocusOnTab
 tests/auto/controls/tst_controls
 tests/auto/qtdesktop/tst_qtdesktop

examples/examples.pro

 TEMPLATE = subdirs
 
-SUBDIRS += \
-    gallery \
-    splitview \
-    stackview \
-    tableview \
-    touch
-
-qtHaveModule(widgets) {
-    SUBDIRS += text \
-        ApplicationTemplate
-}
+SUBDIRS += quick/controls

examples/quick/controls/controls.pro

+TEMPLATE = subdirs
+
+SUBDIRS += \
+    gallery \
+    splitview \
+    stackview \
+    tableview \
+    touch
+
+qtHaveModule(widgets) {
+    SUBDIRS += text \
+        ApplicationTemplate
+}

examples/gallery/content/Controls.qml → examples/quick/controls/gallery/content/Controls.qml

@@ -66,13 +66,18 @@ Item {
                 Button {
                     id: button1
                     text: "Button 1"
-                    width: 97
+                    width: 92
                     tooltip:"This is an interesting tool tip"
                 }
                 Button {
                     id:button2
                     text:"Button 2"
-                    width:97
+                    width: 102
+                    menu: Menu {
+                        MenuItem { text: "This Button" }
+                        MenuItem { text: "Happens To Have" }
+                        MenuItem { text: "A Menu Assigned" }
+                    }
                 }
             }
             ComboBox {

examples/gallery/content/Styles.qml → examples/quick/controls/gallery/content/Styles.qml

@@ -116,13 +116,13 @@ Item {
                 value: 50
                 maximumValue: 100
                 width: 100
-                style: SliderStyle { backgroundColor: colorDialog.color}
+                style: SliderStyle { }
             }
             Slider {
                 value: 50
                 maximumValue: 100
                 width: 100
-                style: SliderStyle { backgroundColor: "#eee"}
+                style: SliderStyle { }
             }
             Slider {
                 value: 50