Update QML UI test environment for Settings > General dialog

tests/ui/qml/StubMenu.qml

@@ -528,10 +528,6 @@ Menu {
                 text: menuOption.turnWithHead;
                 checkable: true
             }
-            MenuItem {
-                text: menuOption.comfortMode;
-                checkable: true
-            }
             MenuItem {
                 text: menuOption.keyboardMotorControl;
                 checkable: true

tests/ui/qml/Stubs.qml

@@ -23,6 +23,20 @@ Item {
         function getUsername() { return "Jherico"; }
     }
 
+    Item {
+        objectName: "ApplicationCompositor"
+        property bool reticleOverDesktop: true
+    }
+
+    Item {
+        objectName: "Preferences"
+        // List of categories obtained by logging categories as they are added in Interface in Preferences::addPreference().
+        property var categories: [
+            "Avatar Basics", "Snapshots", "Scripts", "Privacy", "Level of Detail Tuning", "Avatar Tuning", "Avatar Camera",
+            "Audio", "Octree", "HMD", "Sixense Controllers", "Graphics"
+        ]
+    }
+
     Item {
         objectName: "ScriptDiscoveryService"
         //property var scriptsModelFilter: scriptsModel

tests/ui/qml/main.qml

@@ -38,6 +38,18 @@ ApplicationWindow {
             property var tabs: [];
             property var urls: [];
 
+            Button {
+                // Shows the dialog with preferences sections but not each section's preference items
+                // because Preferences.preferencesByCategory() method is not stubbed out.
+                text: "Settings > General..."
+                property var builder: Component {
+                    GeneralPreferencesDialog { }
+                }
+                onClicked: {
+                    var runningScripts = builder.createObject(desktop);
+                }
+            }
+
             Button {
                 text: "Running Scripts"
                 property var builder: Component {

tests/ui/src/main.cpp

@@ -85,9 +85,11 @@ int main(int argc, char *argv[]) {
 
     setChild(engine, "offscreenFlags");
     setChild(engine, "Account");
+    setChild(engine, "ApplicationCompositor");
     setChild(engine, "Desktop");
     setChild(engine, "ScriptDiscoveryService");
     setChild(engine, "MenuHelper");
+    setChild(engine, "Preferences");
     setChild(engine, "urlHandler");
     engine.rootContext()->setContextProperty("DebugQML", true);
     engine.rootContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());