Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Landing OTA13-2016-06-29

Landing OTA13-2016-06-29

[Zoltan Balogh (bzoltan)]

review: Approve

[lp:~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29]

2045. By Zoltan Balogh on 2016-07-29

update from staging

2046. By Zoltan Balogh on 2016-08-01

Update from staging

2047. By Zoltan Balogh on 2016-08-02

Sync with staging

2048. By Zoltan Balogh on 2016-08-02

Sync with staging

2049. By Zoltan Balogh on 2016-08-08

Use safe qstrcmp: typeName() can be 0

2050. By Zoltan Balogh on 2016-08-09

Update from staging

2051. By Zoltan Balogh on 2016-08-09

Update from staging

2052. By Zoltan Balogh on 2016-08-09

Update from staging

2053. By Zoltan Balogh on 2016-08-10

Update from staging

2054. By Zoltan Balogh on 2016-08-12

sync with staging

2055. By Zoltan Balogh on 2016-08-12

sync with staging

2056. By Zoltan Balogh on 2016-08-14

update from staging

=== modified file 'README'
--- README	2016-03-16 14:53:19 +0000
+++ README	2016-08-14 09:05:30 +0000
@@ -44,6 +44,41 @@
 shell.
 
 
+Tests
+-----
+
+tests
+ - autopilot/ubuntuuitoolkit: Autopilot test cases and CPOs
+   ./run_tests.sh list
+   ./run_tests.sh run [TESTCASE]
+ - api: Tests for apicheck (API description generator)
+   Run 'make check' in the folder
+ - license: Script to verify that sources contains copright headers
+   make license
+ - resources: Manual test cases (deprecated, should move to unit/visual)
+ - unit:
+   Unit tests using QTest/UbuntuTestCase
+   Run 'make check[_BASENAME_WITH_UNDERSCORES]' in the respective subfolder
+   eg. 'tst_label_extras.13.qml' becomes 'make check_tst_label_extras_13'
+   This is driven by runtest.sh and checkresults.sh.
+  - visual: All tests in this folder can be run as unit tests as well as
+    interactively. That means 'make check' or via gallery.sh.
+    Optional: prefix with './tests/xvfb.sh' to run inside XVfb.
+    Note for adding new files: The root must be a visual Item-based type
+    with a width and height. TestCase or UbuntuTestCase must be a child.
+
+ Verify the whole Toolkit API:
+ './tests/qmlapicheck.sh' inspects components.api and produces components.api.new
+
+ Verify the tidyness of packaging:
+ ./packaging-sorting.sh
+
+ Verify the coding style of Python source code:
+ pyflakes .
+
+ 'source export_qml_dir.sh' can be used in bash to setup the environment.
+
+
 Documentation
 -------------
 
 
=== modified file 'components.api'
--- components.api	2016-07-25 14:14:08 +0000
+++ components.api	2016-08-14 09:05:30 +0000
@@ -29,6 +29,8 @@
     property Component delegate
     property int numberOfSlots
 Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
+    property color backgroundColor
+    readonly property ActionItemProperties buttons
     property Component defaultDelegate
     property int defaultNumberOfSlots
     property string overflowIconName
@@ -47,6 +49,13 @@
     function trigger(var value)
     function trigger()
     property string text
+Ubuntu.Components.Styles.ActionItemProperties 1.3: QtObject
+    property color backgroundColor
+    property color disabledBackgroundColor
+    property color disabledForegroundColor
+    property color foregroundColor
+    property color pressedBackgroundColor
+    property color pressedForegroundColor
 Ubuntu.Components.ActionList 1.0 0.1: QtObject
     property list<Action> actions
     default property list<Action> children
@@ -821,6 +830,7 @@
     readonly property ActionBar trailingActionBar
 Ubuntu.Components.Styles.PageHeaderStyle 1.3: Item
     property color backgroundColor
+    readonly property ActionItemProperties buttons
     property double contentHeight
     property Component defaultActionDelegate
     property color disabledForegroundColor
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-08-09 13:05:01 +0000
+++ debian/changelog	2016-08-14 09:05:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-ui-toolkit (1.3.2030+16.10.20160726.15) yakkety; urgency=medium
 
   * More s390x dependencies workarounding until upstart is really fixed.
@@ -5,6 +6,75 @@
 
  -- Timo Jyrinki <[e-mail]>  Mon, 08 Aug 2016 13:26:34 +0300
 
+=======
+ubuntu-ui-toolkit (1.3.2060+16.10) UNRELEASED; urgency=medium
+
+  [ Zoltan Balogh ]
+  * Fix OptionSelectorTestCase tests.
+  * Fix more OptionSelector autopilot tests
+
+  [ Timo Jyrinki ]
+  * Disable documentation building for GLES builds. Fixes LP: #1606222.
+  * Replace abs with qFabs due to GCC6 breakage. Fixes LP: #1610943.
+  * Limit s390x dependencies more due to upstart/s390x problems and removed
+    packages in archives. Fixes LP: #1610951
+
+  [ Andrea Bernabei ]
+  * ListItemLayout doc: add elide mode change example and add section about
+    labels default properties values. Fixes LP: #1603450.
+  * ListItemLayout doc: add explicit note about the need to bind ListItem's
+    height to layout's height.
+  * More Scrollbar optimizations: 20% faster creation time. Fixes LP: #1606451
+  * Scrollbar: fix wrong thumb color on tap/mouse release and increase coverage
+    of hover states unit tests. Fixes LP: #1608897
+
+  [ Zsombor Egri ]
+  * Fix null pointer property initializer used with 1.3 PageWrapper. 
+    Fixes LP: #1604780.
+  * Fix BottomEdge content URL preloading. Fixes LP: #1604509.
+
+  [Albert Astals Cid ]
+  * UCUnits::resolveResource: Prefer image path if it exists. This saves
+    searching the disk for @gu images, which is a big speedup. According to
+    callgrind loading 100 images from a folder that contains 380 images goes
+    from around 3 million instructions per UCUnits::resolveResource call down
+    to around 10 thousand. This optimization is ok since it is not correct to
+    ship both image.png and [e-mail]. You either have to ship gu-enabled
+    files or not, but mixing them is not allowed. Searched for cases in which
+    that may be happening in my phone and found none. Fixes LP: #1604029.
+
+  [ Tim Peeters ]
+  * Configure colors of the buttons in the ActionBar and PageHeader through
+    their Styles. Fixes LP: #1597774.
+  * Fix assigning of constant values to a grouped property in StyleHints.
+    Fixes LP: #1602836.
+  * Fix list view keyboard navigation for RightToLeft and BottomToTop 
+    directions. Fixes LP: #1605634
+  * Use external QML files instead of embedded QML strings for autopilot tests.
+    Fixes LP: #1578319
+  * Fix failing autopilot header tests.
+  * Fix ActionSelectionPopover Autopilot CPO tests.
+
+  [Christian Dywan ]
+  * Include indexes in "offline" docs and filter out link errors.
+    Fixes LP: #1603937.
+  * Increase focus ring thickness from 1dp to 2dp. Fixes LP: #1602690.
+  * Add a snippet about tests to the toplevel README
+  * Enter/Return to trigger, Space to expand ComboButton. Fixes LP: #1523817.
+  * Initialize engine variable before using it in the _engine case.
+  * Use Qt.rgba instead of #0000 checking ListItem default color. 
+    Fixes LP: #1560004
+  * Don't use a different .desktop file in the gallery tests.
+    Fixes LP: #1578319
+  * Update scaling docs, set QT_SCALE_FACTOR and unset GRID_UNIT_PX.
+    Fixes LP: #1610208
+
+  [ Florian Boucault ]
+  * Sections: load Icons asynchronously.
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 29 Jul 2016 14:49:16 +0300
+
+>>>>>>> MERGE-SOURCE
 ubuntu-ui-toolkit (1.3.2030+16.10.20160726.2) yakkety; urgency=medium
   [ William Hua ]
   * Make qml-module-ubuntu-components-gles depend on 
 
=== modified file 'documentation/docs.sh'
--- documentation/docs.sh	2015-05-19 09:16:44 +0000
+++ documentation/docs.sh	2016-08-14 09:05:30 +0000
@@ -28,7 +28,7 @@
 # Offline docs for QtCreator
 eval "$QDOC $SRC/ubuntu-ui-toolkit-qtcreator.qdocconf 2> $DOC_PATH/qdoc.log"
 # FIXME: With Qt 5.2 this warning shows up, forcibly omit it from errors
-grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
+grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" | grep -v "warning: Can't link to" > $DOC_PATH/qdoc.err
 cat $DOC_PATH/qdoc.err
 test ! -s $DOC_PATH/qdoc.err || exit 1
 echo docs: Offline done.
@@ -36,15 +36,23 @@
 eval "$QHELPGENERATOR -o '$DOC_PATH/ubuntuuserinterfacetoolkit.qch' '$DOC_PATH/offline/ubuntuuserinterfacetoolkit.qhp' | grep -v ' does not exist! Skipping it'"
 echo docs: qch done: $DOC_PATH
 
-# Online docs. Run qdoc twice: the second run with indexes for cross-referencing
-# other APIs but discard errors because qdoc inherits all doc bugs otherwise
+# Online docs
 eval "$QDOC $SRC/ubuntu-ui-toolkit-online.qdocconf 2> $DOC_PATH/qdoc.log"
-grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
+grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" | grep -v "warning: Can't link to" > $DOC_PATH/qdoc.err
 cat $DOC_PATH/qdoc.err
 test ! -s $DOC_PATH/qdoc.err || exit 1
 echo docs: Online done.
 
-eval "$QDOC $SRC/ubuntu-ui-toolkit-online-indexes.qdocconf 2> /dev/null"
+# Second qdoc pass, this time with indexes for cross-referencing.
+# If we don't do this, bugs in docs from other modules (Qt, Unity) fail our build
+eval "$QDOC $SRC/ubuntu-ui-toolkit-offline-indexes.qdocconf 2> $DOC_PATH/qdoc.log"
+grep "warning: Can't link to" $DOC_PATH/qdoc.log > $DOC_PATH/qdoc.err
+cat $DOC_PATH/qdoc.err
+test ! -s $DOC_PATH/qdoc.err || exit 1
+eval "$QDOC $SRC/ubuntu-ui-toolkit-online-indexes.qdocconf 2> $DOC_PATH/qdoc.log"
+grep "warning: Can't link to" $DOC_PATH/qdoc.log > $DOC_PATH/qdoc.err
+cat $DOC_PATH/qdoc.err
+test ! -s $DOC_PATH/qdoc.err || exit 1
 echo docs: Cross-referenced done.
 
 sed -r -i 's@(</p>)<p/>@\1@g' $DOC_PATH/html/*.html
 
=== added file 'documentation/ubuntu-ui-toolkit-indexes.qdocconf'
--- documentation/ubuntu-ui-toolkit-indexes.qdocconf	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-ui-toolkit-indexes.qdocconf	2016-08-14 09:05:30 +0000
@@ -0,0 +1,9 @@
+indexes = \
+    /usr/share/qt5/doc/qtqml/qtqml.index \
+    /usr/share/qt5/doc/qtquick/qtquick.index \
+    /usr/share/qt5/doc/qtwebkit/qtwebkit.index \
+    /usr/share/qt5/doc/qtsvg/qtsvg.index \
+    /usr/share/qt5/doc/qtscript/qtscript.index \
+    /usr/share/qt5/doc/qtmultimedia/qtmultimedia.index \
+    /usr/share/doc/unity-action/qml/unity-action-qml-api.index \
+
 
=== renamed file 'documentation/ubuntu-ui-toolkit-online-indexes.qdocconf' => 'documentation/ubuntu-ui-toolkit-offline-indexes.qdocconf'
--- documentation/ubuntu-ui-toolkit-online-indexes.qdocconf	2013-12-09 11:33:51 +0000
+++ documentation/ubuntu-ui-toolkit-offline-indexes.qdocconf	2016-08-14 09:05:30 +0000
@@ -1,11 +1,2 @@
-include(ubuntu-ui-toolkit-online.qdocconf)
-
-indexes = \
-    /usr/share/qt5/doc/qtqml/qtqml.index \
-    /usr/share/qt5/doc/qtquick/qtquick.index \
-    /usr/share/qt5/doc/qtwebkit/qtwebkit.index \
-    /usr/share/qt5/doc/qtsvg/qtsvg.index \
-    /usr/share/qt5/doc/qtscript/qtscript.index \
-    /usr/share/qt5/doc/qtmultimedia/qtmultimedia.index \
-    /usr/share/doc/unity-action/qml/unity-action-qml-api.index \
-
+include(ubuntu-ui-toolkit-offline.qdocconf)
+include(ubuntu-ui-toolkit-indexes.qdocconf)
 
=== added file 'documentation/ubuntu-ui-toolkit-online-indexes.qdocconf'
--- documentation/ubuntu-ui-toolkit-online-indexes.qdocconf	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-ui-toolkit-online-indexes.qdocconf	2016-08-14 09:05:30 +0000
@@ -0,0 +1,2 @@
+include(ubuntu-ui-toolkit-online.qdocconf)
+include(ubuntu-ui-toolkit-indexes.qdocconf)
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-02-12 10:55:51 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-08-14 09:05:30 +0000
@@ -110,8 +110,8 @@
                 width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
-                    delegate: Standard {
-                        text: "item #" + modelData
+                    delegate: ListItemWithLabel {
+                        title.text: "item #" + modelData
                     }
                 }
             }
@@ -125,8 +125,8 @@
                 width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
-                    delegate: Standard {
-                        text: "item #" + modelData
+                    delegate: ListItemWithLabel {
+                        title.text: "item #" + modelData
                     }
                 }
             }
@@ -141,8 +141,8 @@
                 width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
-                    delegate: Standard {
-                        text: "item #" + modelData
+                    delegate: ListItemWithLabel {
+                        title.text: "item #" + modelData
                     }
                 }
             }
@@ -157,8 +157,8 @@
                 width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
-                    delegate: Standard {
-                        text: "item #" + modelData
+                    delegate: ListItemWithLabel {
+                        title.text: "item #" + modelData
                     }
                 }
             }
 
=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
--- src/Ubuntu/Components/1.3/ComboButton.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2016-08-14 09:05:30 +0000
@@ -331,6 +331,19 @@
         onClicked: {
             // toggle expanded
             combo.expanded = !combo.expanded;
+            combo.forceActiveFocus()
+        }
+    }
+
+    Keys.onReleased: {
+        if (event.key == Qt.Key_Enter || event.key == Qt.Key_Return) {
+            // Enter or Return should trigger, not expand
+            event.accepted = true;
+            combo.trigger();
+        } else if (event.key == Qt.Key_Space) {
+            // Space should expand, not trigger
+            event.accepted = true;
+            combo.expanded = !combo.expanded;
         }
     }
 
 
=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2016-06-14 14:37:54 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-08-14 09:05:30 +0000
@@ -181,7 +181,9 @@
         actions: header.navigationActions
         visible: leading.width > 0 // at least 1 visible action
         StyleHints {
+            ignoreUnknownProperties: false
             overflowIconName: "navigation-menu"
+            backgroundColor: header.__styleInstance.backgroundColor
         }
     }
 
@@ -227,6 +229,10 @@
         numberOfSlots: MathUtils.clamp(0.3*header.width/units.gu(4), 3, 6)
         delegate: header.__styleInstance.defaultActionDelegate
         visible: trailing.width > 0 // at least 1 visible action
+        StyleHints {
+            ignoreUnknownProperties: false
+            backgroundColor: header.__styleInstance.backgroundColor
+        }
     }
 
     /*!
 
=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2016-08-14 09:05:30 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3 as Toolkit
+import Ubuntu.Components.Private 1.3 as Private
 
 /*!
     \qmltype Scrollbar
@@ -141,14 +142,6 @@
     */
     property bool __interactive: __styleInstance !== null && __styleInstance.interactive
 
-
-    /*!
-      \internal
-      This trough of the scrollbar, it is used to define the position of the slider.
-    */
-    property Item __trough: __styleInstance !== null && __styleInstance.trough
-
-
     /*!
       \internal
       simulate the system setting (which will be implemented in unity8, I guess)
@@ -167,27 +160,28 @@
     //Disable the input handling to let the events pass through in case we have an
     //interactive scrollbar right below us (can happen with nested views)
     enabled: __interactive//&& __alwaysOnScrollbars
+    visible: __initializedFlickable !== null
 
-    implicitWidth: internals.vertical ? units.gu(3) : (flickableItem ? flickableItem.width : 0)
-    implicitHeight: !internals.vertical ? units.gu(3) : (flickableItem ? flickableItem.height : 0)
+    implicitWidth: internals.vertical ? units.gu(3) : (__initializedFlickable ? __initializedFlickable.width : 0)
+    implicitHeight: !internals.vertical ? units.gu(3) : (__initializedFlickable ? __initializedFlickable.height : 0)
 
     anchors {
-        left: (__viewport || flickableItem)
-              ? internals.leftAnchor(__viewport ? __viewport : flickableItem)
+        left: (__viewport || __initializedFlickable)
+              ? internals.leftAnchor(__viewport ? __viewport : __initializedFlickable)
               : undefined
         leftMargin: internals.leftAnchorMargin()
-        right: (__viewport || flickableItem)
-               ? internals.rightAnchor(__viewport ? __viewport : flickableItem)
+        right: (__viewport || __initializedFlickable)
+               ? internals.rightAnchor(__viewport ? __viewport : __initializedFlickable)
                : undefined
         rightMargin: internals.rightAnchorMargin()
-        top: (__viewport || flickableItem)
-             ? internals.topAnchor(__viewport ? __viewport : flickableItem)
+        top: (__viewport || __initializedFlickable)
+             ? internals.topAnchor(__viewport ? __viewport : __initializedFlickable)
              : undefined
-        topMargin: (flickableItem ? flickableItem.topMargin : 0) + internals.topAnchorMargin()
-        bottom: (__viewport || flickableItem)
-                ? internals.bottomAnchor(__viewport ? __viewport : flickableItem)
+        topMargin: (__initializedFlickable ? __initializedFlickable.topMargin : 0) + internals.topAnchorMargin()
+        bottom: (__viewport || __initializedFlickable)
+                ? internals.bottomAnchor(__viewport ? __viewport : __initializedFlickable)
                 : undefined
-        bottomMargin: (flickableItem ? flickableItem.bottomMargin : 0) + internals.bottomAnchorMargin()
+        bottomMargin: (__initializedFlickable ? __initializedFlickable.bottomMargin : 0) + internals.bottomAnchorMargin()
     }
 
     /*!
@@ -195,6 +189,26 @@
       */
     onAlignChanged: if (!internals.checkAlign()) console.log("Wrong alignment set to Scrollbar: "+align)
 
+    //Don't do anything with flickableItem until its creation is complete, it would be a waste of cpu cycles
+    //and it would block the rendering thread for much longer
+    property var __initializedFlickable: null
+    Connections {
+        target: flickableItem
+        Component.onCompleted: __initializedFlickable = flickableItem
+    }
+    onFlickableItemChanged: {
+        if (!flickableItem) __initializedFlickable = null
+        else {
+            //can't use a binding for this, because the "completeness" of a component is
+            //not esposed to QML, QML just gets Component.onCompleted when a component is
+            //completed, but you won't get that if we're assigned a Flickable which is
+            //already "complete"
+            if (Private.PrivateScrollbarUtils.isComponentComplete(flickableItem)) {
+                __initializedFlickable = flickableItem
+            }
+        }
+    }
+
     /*!
       \internal
       Internals: contains the common logic of the scrollbar like anchoring,
@@ -204,7 +218,7 @@
     QtObject {
         id: internals
         property bool vertical: (align === Qt.AlignLeading) || (align === Qt.AlignTrailing)
-        property bool scrollable: flickableItem && flickableItem.interactive && checkAlign()
+        property bool scrollable: __initializedFlickable && __initializedFlickable.interactive && checkAlign()
         property real nonOverlayScrollbarMargin: __styleInstance ? __styleInstance.nonOverlayScrollbarMargin : 0
 
         function checkAlign()
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml'
--- src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml	2015-08-18 16:28:26 +0000
+++ src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml	2016-08-14 09:05:30 +0000
@@ -120,6 +120,8 @@
         }
         /*! \internal */
         onTriggered: popover.hide()
+        // FIXME: Disabled actions should be visible, but greyed-out.
+        //  See bug 1612579. Tests will also need to be updated.
         visible: enabled && ((action === undefined) || action.visible)
         height: visible ? implicitHeight : 0
     }
 
=== modified file 'src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml	2015-10-15 14:17:25 +0000
+++ src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml	2016-08-14 09:05:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
 
 /*!
     \qmltype ActionBarStyle
-    \inqmlmodule Ubuntu.Components.Styles 1.1
+    \inqmlmodule Ubuntu.Components.Styles 1.3
     \ingroup style-api
     \brief Style API for action bar.
 
@@ -25,6 +25,16 @@
   */
 Item {
     /*!
+      The color of the background of the action bar.
+     */
+    property color backgroundColor
+
+    /*!
+      Configuration of the colors of the action buttons in the action bar.
+     */
+    readonly property ActionItemProperties buttons: ActionItemProperties { }
+
+    /*!
       The default action delegate if the styled item does
       not provide a different delegate.
      */
 
=== added file 'src/Ubuntu/Components/Styles/1.3/ActionItemProperties.qml'
--- src/Ubuntu/Components/Styles/1.3/ActionItemProperties.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Styles/1.3/ActionItemProperties.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+
+/*!
+    \qmltype ButtonProperties
+    \inqmlmodule Ubuntu.Components.Styles 1.3
+    \ingroup style-api
+    \brief Color properties for buttons.
+
+    Defines the colors of buttons.
+  */
+QtObject {
+    /*!
+      The foreground color of an unpressed enabled button.
+     */
+    property color foregroundColor
+
+    /*!
+      The foreground color of a disabled button.
+     */
+    property color disabledForegroundColor
+
+    /*!
+      The foreground color of a button when being pressed.
+     */
+    property color pressedForegroundColor
+
+    /*!
+      The background color of an unpressed enabled button.
+     */
+    property color backgroundColor
+
+    /*!
+      The background color of a disabled button.
+     */
+    property color disabledBackgroundColor
+
+    /*!
+      The background color of a button when being pressed.
+     */
+    property color pressedBackgroundColor
+}
 
=== modified file 'src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2016-03-30 15:12:36 +0000
+++ src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2016-08-14 09:05:30 +0000
@@ -30,7 +30,9 @@
     property color foregroundColor
 
     /*!
+      \deprecated
       The color of disabled action buttons in the header.
+      Replaced by buttons.disabledForegroundColor.
      */
     property color disabledForegroundColor
 
@@ -45,6 +47,11 @@
     property color backgroundColor
 
     /*!
+      Configuration of the colors of the action buttons in the header.
+     */
+    readonly property ActionItemProperties buttons: ActionItemProperties { }
+
+    /*!
       The color of the divider at the bottom of the header.
      */
     property color dividerColor
 
=== modified file 'src/Ubuntu/Components/Styles/Styles.pro'
--- src/Ubuntu/Components/Styles/Styles.pro	2016-06-23 09:13:51 +0000
+++ src/Ubuntu/Components/Styles/Styles.pro	2016-08-14 09:05:30 +0000
@@ -13,6 +13,7 @@
 	     1.3/PageHeaderStyle.qml \
 	     1.3/ToolbarStyle.qml \
 	     1.3/SectionsStyle.qml \
+	     1.3/ActionItemProperties.qml \
 
 load(ubuntu_qml_plugin)
 
 
=== modified file 'src/Ubuntu/Components/Styles/qmldir'
--- src/Ubuntu/Components/Styles/qmldir	2016-06-23 09:13:51 +0000
+++ src/Ubuntu/Components/Styles/qmldir	2016-08-14 09:05:30 +0000
@@ -12,3 +12,4 @@
 PageHeaderStyle 1.3 1.3/PageHeaderStyle.qml
 ToolbarStyle 1.3 1.3/ToolbarStyle.qml
 SectionsStyle 1.3 1.3/SectionsStyle.qml
+ActionItemProperties 1.3 1.3/ActionItemProperties.qml
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-12-09 21:41:45 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2016-08-14 09:05:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -28,19 +28,49 @@
     // Unused with the standard action icon buttons, but may be used with a custom delegate.
     overflowText: "More"
 
+    backgroundColor: theme.palette.normal.background
+    buttons {
+        foregroundColor: theme.palette.normal.backgroundText
+        pressedForegroundColor: buttons.foregroundColor
+        disabledForegroundColor: theme.palette.disabled.backgroundText
+        backgroundColor: "transparent" // action bar background is already colored
+        pressedBackgroundColor: theme.palette.highlighted.background
+        disabledBackgroundColor: buttons.backgroundColor
+    }
+
     /*!
       The default action delegate if the styled item does
       not provide a delegate.
      */
-    defaultDelegate: AbstractButton {
-        style: IconButtonStyle { }
-        objectName: action.objectName + "_button"
-        height: parent ? parent.height : undefined
-        action: modelData
+    defaultDelegate: Component {
+        AbstractButton {
+            id: button
+            style: IconButtonStyle {
+                foregroundColor: button.pressed ?
+                                     actionBarStyle.buttons.pressedForegroundColor :
+                                     button.enabled ?
+                                         actionBarStyle.buttons.foregroundColor :
+                                         actionBarStyle.buttons.disabledForegroundColor
+                backgroundColor: button.pressed ?
+                                     actionBarStyle.buttons.pressedBackgroundColor :
+                                     button.enabled ?
+                                         actionBarStyle.buttons.backgroundColor :
+                                         actionBarStyle.buttons.disabledBackgroundColor
+            }
+            objectName: action.objectName + "_button"
+            height: parent ? parent.height : undefined
+            action: modelData
+        }
     }
 
     defaultNumberOfSlots: 3
 
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: actionBarStyle.backgroundColor
+    }
+
     Component {
         id: fadeInComponent
         SequentialAnimation {
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2016-02-09 15:56:48 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2016-08-14 09:05:30 +0000
@@ -237,6 +237,9 @@
                 }
             }
         }
+
+        FocusShape {
+        }
     }
 
     Item {
@@ -247,7 +250,8 @@
             top: mainButton.bottom
             right: parent.right
         }
-        opacity: styledItem.expanded && (styledItem.comboList.length > 0)? 1.0 : 0.0
+        // Hide panel to suppress keyboard input including (Shift)Tab
+        visible: styledItem.expanded && (styledItem.comboList.length > 0)
 
         ShaderEffectSource {
             id: listContent
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-04-27 07:31:49 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-08-14 09:05:30 +0000
@@ -26,7 +26,7 @@
     color: styledItem.enabled
                 ? theme.palette.normal.focus
                 : theme.palette.disabled.focus
-    thickness: units.dp(1)
+    thickness: units.dp(2)
     radius: units.gu(1.7)
     visible: styledItem.keyNavigationFocus
 
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-06-14 14:37:54 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-08-14 09:05:30 +0000
@@ -26,6 +26,14 @@
     subtitleColor: theme.palette.normal.backgroundTertiaryText
     backgroundColor: theme.palette.normal.background
     dividerColor: theme.palette.normal.base
+    buttons {
+        foregroundColor: pageHeaderStyle.foregroundColor
+        disabledForegroundColor: pageHeaderStyle.disabledForegroundColor
+        pressedForegroundColor: buttons.foregroundColor
+        backgroundColor: "transparent"
+        pressedBackgroundColor: theme.palette.highlighted.background
+        disabledBackgroundColor: buttons.backgroundColor
+    }
 
     // Font weight for the title and subtitle
     property int fontWeight: Font.Light
@@ -84,13 +92,22 @@
     }
 
     defaultActionDelegate: AbstractButton {
+        id: button
         style: IconButtonStyle { }
         objectName: action.objectName + "_button"
         height: internal.titleAreaHeight
         action: modelData
         StyleHints {
-            foregroundColor: enabled ? pageHeaderStyle.foregroundColor
-                                     : pageHeaderStyle.disabledForegroundColor
+            foregroundColor: button.pressed ?
+                                 pageHeaderStyle.buttons.pressedForegroundColor :
+                                 button.enabled ?
+                                     pageHeaderStyle.buttons.foregroundColor :
+                                     pageHeaderStyle.buttons.disabledForegroundColor
+            backgroundColor: button.pressed ?
+                                 pageHeaderStyle.buttons.pressedBackgroundColor :
+                                 button.enabled ?
+                                     pageHeaderStyle.buttons.backgroundColor :
+                                     pageHeaderStyle.buttons.disabledBackgroundColor
         }
     }
 
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2016-06-30 15:19:36 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2016-08-14 09:05:30 +0000
@@ -114,7 +114,7 @@
      *      HELPER PROPERTIES                            *
      *****************************************************/
     property alias thumb: slider
-    property Item trough: trough
+    property alias trough: trough
 
     //helper properties to ease code readability
     property bool isScrollable: styledItem.__private.scrollable && pageSize > 0.0
@@ -126,7 +126,8 @@
     property bool bottomAligned: (styledItem.align === Qt.AlignBottom)
 
     //flickable helper properties
-    property Flickable flickableItem: styledItem.flickableItem
+    //Don't do anything with the flickable until its Component.onCompleted is called, it's a waste of cycles
+    property Flickable flickableItem: styledItem.__initializedFlickable
     property real pageSize: flickableItem
                             ? (isVertical ? flickableItem.height : flickableItem.width)
                             : 0
@@ -233,14 +234,18 @@
             scrollAnimation.restart()
         } else {
             if (scrollAnimation.running) scrollAnimation.stop()
-            styledItem.flickableItem[scrollbarUtils.propContent] = value
-            styledItem.flickableItem.returnToBounds()
+            if (flickableItem) {
+                flickableItem[scrollbarUtils.propContent] = value
+                flickableItem.returnToBounds()
+            }
         }
     }
     function scrollToBeginning(animate) {
+        if (!flickableItem) return
         scrollTo(flickableItem[scrollbarUtils.propOrigin] - visuals.leadingContentMargin, animate)
     }
     function scrollToEnd(animate) {
+        if (!flickableItem) return
         scrollTo((flickableItem[scrollbarUtils.propOrigin]
                   + totalContentSize - visuals.leadingContentMargin - pageSize), animate)
     }
@@ -319,12 +324,14 @@
           Calculates the slider position based on the visible area's ratios.
           */
         function sliderPos(scrollbar, min, max) {
+            if (!scrollbar.__initializedFlickable) return min
+
             //the margin between the trough and the thumb min and max values
             var margin = scrollbar.__styleInstance.thumbsExtremesMargin
 
             //The total length of the path where the thumb can be positioned, from its min to its max value
-            var draggableLength = scrollbar.__trough[propSize] - margin*2
-            var maxPosRatio = 1.0 - (scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propSizeRatio] : 1.0)
+            var draggableLength = visuals.trough[propSize] - margin*2
+            var maxPosRatio = 1.0 - (scrollbar.__initializedFlickable ? scrollbar.__initializedFlickable.visibleArea[propSizeRatio] : 1.0)
 
             //Example with x/width, same applies to y/height
             //xPosition is in the range [0...1 - widthRatio]
@@ -335,7 +342,7 @@
             //the maxPosition is reached when xPosition becomes 1, and that never happens. To compensate that, we
             //scale xPosition by ( 1 / ( 1 - widthRatio) ). This way, when xPosition reaches its max ( 1 - widthRatio )
             //we get a multiplication factor of 1
-            return MathUtils.clamp(1.0 / maxPosRatio * (scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propPosRatio] : 1.0)
+            return MathUtils.clamp(1.0 / maxPosRatio * (scrollbar.__initializedFlickable ? scrollbar.__initializedFlickable.visibleArea[propPosRatio] : 1.0)
                                    * (draggableLength - scrollbar.__styleInstance.thumb[propSize]) + margin, min, max);
         }
 
@@ -349,8 +356,10 @@
           THUMB CAN MOVE INTO! (which is what you want in 99.9% of the cases, for a scrollbar)
           */
         function sliderSize(scrollbar, min, max) {
-            var sizeRatio = scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propSizeRatio] : 1.0;
-            var posRatio = scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propPosRatio] : 0.0;
+            if (!scrollbar.__initializedFlickable) return min
+
+            var sizeRatio = scrollbar.__initializedFlickable ? scrollbar.__initializedFlickable.visibleArea[propSizeRatio] : 1.0;
+            var posRatio = scrollbar.__initializedFlickable ? scrollbar.__initializedFlickable.visibleArea[propPosRatio] : 0.0;
 
             //(sizeRatio * max) is the current ideal size, as recommended by Flickable visibleArea props
             var sizeUnderflow = (sizeRatio * max) < min ? min - (sizeRatio * max) : 0
@@ -385,9 +394,11 @@
           using an invisible cursor to drag the slider and the ListView position.
           */
         function scrollAndClamp(scrollbar, amount, min, max) {
-            return scrollbar.flickableItem[propOrigin] +
-                    MathUtils.clamp(scrollbar.flickableItem[propContent]
-                                    - scrollbar.flickableItem[propOrigin] + amount,
+            if (!scrollbar.__initializedFlickable) return
+
+            return scrollbar.__initializedFlickable[propOrigin] +
+                    MathUtils.clamp(scrollbar.__initializedFlickable[propContent]
+                                    - scrollbar.__initializedFlickable[propOrigin] + amount,
                                     min, max);
         }
 
@@ -402,8 +413,10 @@
           NOTE: when flickable.topMargin is 5GU, contentY has to be -5GU (not 0!) to be at the top of the scrollable!!
           */
         function dragAndClamp(scrollbar, relThumbPosition, contentSize, pageSize) {
-            scrollbar.flickableItem[propContent] =
-                    scrollbar.flickableItem[propOrigin] + relThumbPosition * (contentSize - scrollbar.flickableItem[propSize]) - leadingContentMargin; //don't use pageSize, we don't know if the scrollbar is edge to edge!;
+            if (!scrollbar.__initializedFlickable) return
+
+            scrollbar.__initializedFlickable[propContent] =
+                    scrollbar.__initializedFlickable[propOrigin] + relThumbPosition * (contentSize - scrollbar.__initializedFlickable[propSize]) - leadingContentMargin; //don't use pageSize, we don't know if the scrollbar is edge to edge!;
         }
     }
 
@@ -424,7 +437,7 @@
         //duration and easing coming from UX spec
         duration: UbuntuAnimation.SlowDuration
         easing.type: Easing.InOutCubic
-        target: styledItem.flickableItem
+        target: flickableItem
         property: scrollbarUtils.propContent
         //when the listview has variable size delegates the contentHeight estimation done by ListView
         //could make us overshoot, especially when going from top to bottom of the list or viceversa.
@@ -748,7 +761,7 @@
                         pressHoldTimer.stop()
                     }
                     onReleased: {
-                        hoveringThumb = false
+                        handleHover(mouseX, mouseY)
                         resetDrag()
                         pressHoldTimer.stop()
                     }
@@ -939,7 +952,9 @@
                         anchors.centerIn: parent
                         width: __stepperAssetWidth
                         rotation: isVertical ? 180 : 90
-                        source: visible ? Qt.resolvedUrl("../artwork/toolkit_scrollbar-stepper.svg") : ""
+                        //NOTE: Qt.resolvedUrl was removed because it does not seem to be needed and 
+                        //the QML profiler showed it's relatively expensive
+                        source: visible ? "../artwork/toolkit_scrollbar-stepper.svg" : ""
                         asynchronous: true
                         color: Qt.rgba(sliderColor.r, sliderColor.g, sliderColor.b,
                                        sliderColor.a * ((flickableItem && flickableItem[scrollbarUtils.propAtBeginning])
@@ -983,7 +998,9 @@
                         anchors.centerIn: parent
                         width: __stepperAssetWidth
                         rotation: isVertical ? 0 : -90
-                        source: visible ? Qt.resolvedUrl("../artwork/toolkit_scrollbar-stepper.svg") : ""
+                        //NOTE: Qt.resolvedUrl was removed because it does not seem to be needed and     
+                        //the QML profiler showed it's relatively expensive
+                        source: visible ? "../artwork/toolkit_scrollbar-stepper.svg" : ""
                         asynchronous: true
                         color: Qt.rgba(sliderColor.r, sliderColor.g, sliderColor.b,
                                        sliderColor.a * ((flickableItem && flickableItem[scrollbarUtils.propAtEnd])
@@ -999,6 +1016,9 @@
         //just a hack: a rectangle which covers the corner where scrollbars meet, when they're in steppers style
         Rectangle {
             id: cornerRect
+            //NOTE: I tried grouping styledItem.__buddyScrollbar && styledItem.__buddyScrollbar.__styleInstance
+            //    && styledItem.__buddyScrollbar.__styleInstance.isScrollable in 1 property and use that for
+            //all the anchors, but it turned out it makes the instantiation 2-3% slower!!!
             anchors.left: {
                 if (styledItem.__buddyScrollbar && styledItem.__buddyScrollbar.__styleInstance
                         && styledItem.__buddyScrollbar.__styleInstance.isScrollable) {
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-06-13 15:57:20 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-08-14 09:05:30 +0000
@@ -287,6 +287,7 @@
             width: units.gu(1)
             height: units.gu(1)
             visible: false
+            asynchronous: true
             rotation: 180
             opacity: visible
                      ? sectionsListView.atXBeginning ? hoveringArea.iconsDisabledOpacity : 1.0
@@ -316,6 +317,7 @@
             width: units.gu(1)
             height: units.gu(1)
             visible: false
+            asynchronous: true
             opacity: visible
                      ? sectionsListView.atXEnd ? hoveringArea.iconsDisabledOpacity : 1.0
                      : 0.0
 
=== modified file 'src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro'
--- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-08-14 09:05:30 +0000
@@ -148,7 +148,8 @@
     privates/ucpagewrapperincubator_p.h \
     privates/appheaderbase_p.h \
     label_p.h \
-    ucbottomedgeregion_p_p.h
+    ucbottomedgeregion_p_p.h \
+    privates/ucscrollbarutils_p.h
 
 SOURCES += \
     uctheme.cpp \
@@ -224,7 +225,8 @@
     privates/frame.cpp \
     privates/ucpagewrapper.cpp \
     privates/ucpagewrapperincubator.cpp \
-    privates/appheaderbase.cpp
+    privates/appheaderbase.cpp \
+    privates/ucscrollbarutils.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
 
=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp	2016-08-14 09:05:30 +0000
@@ -21,6 +21,7 @@
 #include "quickutils_p.h"
 #include <QtQuick/QQuickItem>
 #include <QtQuick/private/qquickflickable_p.h>
+#include <QtQuick/private/qquickitemview_p.h> // for QQuickItemView::BottomToTop
 
 UT_NAMESPACE_BEGIN
 
@@ -127,7 +128,7 @@
     return false;
 }
 
-// override up/down key presses for ListView; returns true if the key event is consumed
+// override cursor key presses for ListView; returns true if the key event is consumed
 // in which case ListView won't get it.
 bool ListViewProxy::keyPressEvent(QKeyEvent *event)
 {
@@ -138,9 +139,10 @@
         || (orientation == Qt::Horizontal && key != Qt::Key_Left && key != Qt::Key_Right)) {
         return false;
     }
-    // for horizontal moves take into account the layout mirroring
-    bool isRtl = QQuickItemPrivate::get(listView)->effectiveLayoutMirror;
-    bool forwards = (key == Qt::Key_Down || (isRtl ? key == Qt::Key_Left : key == Qt::Key_Right));
+    // effectiveLayoutDirection takes into account effectiveLayoutMirror and layoutDirection.
+    bool isRtl = (Qt::RightToLeft == listView->property("effectiveLayoutDirection").toInt());
+    bool isBtt = (QQuickItemView::BottomToTop == listView->property("verticalLayoutDirection").toInt());
+    bool forwards = (isBtt ? key == Qt::Key_Up : key == Qt::Key_Down) || (isRtl ? key == Qt::Key_Left : key == Qt::Key_Right);
     int oldIndex = this->currentIndex();
     int currentIndex = this->currentIndex();
     int count = this->count();
 
=== modified file 'src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-08-14 09:05:30 +0000
@@ -44,6 +44,8 @@
         //Using WrapAnywhere because ElideRight elides too early when used
         //together with WrapWord, and that produces an unexpected result.
         //This will cover most of the usecases.
+        //NOTE: If you want to use ElideMiddle or ElideLeft you'll have to
+        //set wrapMode to NoWrap (see Text docs for more details)
         m_title->setWrapMode(UCLabel::WrapAnywhere);
         m_title->setElideMode(UCLabel::ElideRight);
         m_title->setMaximumLineCount(1);
@@ -55,6 +57,8 @@
 {
     if (m_subtitle != Q_NULLPTR) {
         m_subtitle->setWrapMode(UCLabel::WrapAnywhere);
+        //NOTE: If you want to use ElideMiddle or ElideLeft you'll have to
+        //set wrapMode to NoWrap (see Text docs for more details)
         m_subtitle->setElideMode(UCLabel::ElideRight);
         m_subtitle->setMaximumLineCount(1);
         m_subtitle->setTextSize(UCLabel::Small);
@@ -65,6 +69,8 @@
 {
     if (m_summary != Q_NULLPTR) {
         m_summary->setWrapMode(UCLabel::WrapAnywhere);
+        //NOTE: If you want to use ElideMiddle or ElideLeft you'll have to
+        //set wrapMode to NoWrap (see Text docs for more details)
         m_summary->setElideMode(UCLabel::ElideRight);
         m_summary->setMaximumLineCount(2);
         m_summary->setTextSize(UCLabel::Small);
 
=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-08-14 09:05:30 +0000
@@ -208,8 +208,21 @@
 
     QQmlContext *context = m_itemContext ? m_itemContext : qmlContext(target);
     for (;i != propMap.constEnd(); i++) {
-        if (!QQmlProperty::write(target, i.key(), i.value(), context)) {
-            qmlInfo(q) << "Could not assign value: "<<i.value()<<"to property: "<<i.key();
+        QQmlProperty prop(target, i.key(), context);
+        bool convertible = true;
+        if (!qstrcmp(i.value().typeName(),"void*")) {
+            // we have void*, we cannot convert that one, so we must force the conversion
+            void *pvalue = i.value().value<void*>();
+            QVariant value(QVariant::Type(prop.propertyType()), pvalue);
+            convertible = value.isValid();
+            if (convertible) {
+                convertible = prop.write(value);
+            }
+        } else {
+            convertible = prop.write(i.value());
+        }
+        if (!convertible) {
+            qmlInfo(q) << "Could not assign value: " << i.value() << " to property: " << i.key();
         }
     }
 }
 
=== added file 'src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils.cpp	2016-08-14 09:05:30 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Andrea Bernabei <[e-mail]>
+ */
+
+#include "ucscrollbarutils_p.h"
+#include <QtQuick/private/qquickitem_p.h>
+
+UT_NAMESPACE_BEGIN
+
+UCScrollbarUtils::UCScrollbarUtils(QObject *parent) : QObject(parent)
+{
+}
+
+bool UCScrollbarUtils::isComponentComplete(QQuickItem *item)
+{
+    if (item == Q_NULLPTR) {
+        qDebug() << "ScrollbarUtils: null Item parameter.";
+        return false;
+    } else {
+        QQuickItemPrivate *f = QQuickItemPrivate::get(item);
+        if (f == Q_NULLPTR) {
+            //don't fall apart, but give a warning
+            qDebug() << "ScrollbarUtils: failed to get item's pimpl.";
+            return false;
+        }
+        return f->componentComplete;
+    }
+}
+
+UT_NAMESPACE_END
 
=== added file 'src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils_p.h	2016-08-14 09:05:30 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Andrea Bernabei <[e-mail]>
+ */
+
+#ifndef UCSCROLLBARUTILS_H
+#define UCSCROLLBARUTILS_H
+
+#include <QObject>
+#include <ubuntutoolkitglobal.h>
+
+class QQuickItem;
+
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT UCScrollbarUtils : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UCScrollbarUtils(QObject *parent = 0);
+
+    Q_INVOKABLE static bool isComponentComplete(QQuickItem *item);
+
+};
+
+UT_NAMESPACE_END
+
+#endif // UCSCROLLBARUTILS_H
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp'
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-08-14 09:05:30 +0000
@@ -88,6 +88,7 @@
 #include <privates/frame_p.h>
 #include <privates/ucpagewrapper_p.h>
 #include <privates/appheaderbase_p.h>
+#include <privates/ucscrollbarutils_p.h>
 
 // styles
 #include <ucbottomedgestyle_p.h>
@@ -245,6 +246,9 @@
     qmlRegisterType<UCAppHeaderBase>(privateUri, 1, 3, "AppHeaderBase");
     qmlRegisterType<Tree>(privateUri, 1, 3, "Tree");
 
+    //FIXME: move to a more generic location, i.e StyledItem or QuickUtils
+    qmlRegisterSimpleSingletonType<UCScrollbarUtils>(privateUri, 1, 3, "PrivateScrollbarUtils");
+
     // allocate all context property objects prior we register them
     initializeContextProperties(engine);
 
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp'
--- src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp	2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp	2016-08-14 09:05:30 +0000
@@ -35,12 +35,12 @@
     , acceptEvents(true)
     , pressAndHoldConnected(false)
 {
+    isFocusScope = false;
 }
 void UCAbstractButtonPrivate::init()
 {
     Q_Q(UCAbstractButton);
     q->setActiveFocusOnPress(true);
-    q->setActiveFocusOnTab(true);
 }
 
 /*!
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp	2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp	2016-08-14 09:05:30 +0000
@@ -382,7 +382,7 @@
     d->url = url;
     Q_EMIT contentChanged(d->url);
     // invoke loader if the preload is set
-    if (d->bottomEdge && (d->bottomEdge->preloadContent()) && !d->url.isValid()) {
+    if (d->bottomEdge && (d->bottomEdge->preloadContent()) && d->url.isValid()) {
         d->loadContent(UCBottomEdgeRegionPrivate::LoadingUrl);
     }
 }
 
=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitem.cpp'
--- src/Ubuntu/UbuntuToolkit/uclistitem.cpp	2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/uclistitem.cpp	2016-08-14 09:05:30 +0000
@@ -1127,7 +1127,7 @@
 
     // focus frame
     bool paintFocus = hasActiveFocus() && keyNavigationFocus();
-    rectNode->setPenWidth(paintFocus ? UCUnits::instance()->dp(1) : 0);
+    rectNode->setPenWidth(paintFocus ? UCUnits::instance()->dp(2) : 0);
     if (paintFocus) {
         QColor penColor;
         if (getTheme()) {
 
=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp'
--- src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp	2016-08-14 09:05:30 +0000
@@ -40,6 +40,11 @@
     ListItemLayout is essentially a \l {SlotsLayout} with a predefined
     \l {SlotsLayout::mainSlot} that provides (up to) 3 Labels automatically laid out
     according to our UI guidelines.
+
+    \b Note: those labels may have properties whose default value is different
+    from what is used by the standard Label component. The default wrapMode,
+    for instance, is different. Have a look at \l {Labels' properties} section.
+
     This main slot has been optimized to cover most of the usecases
     without compromising performance (read more in \l {Optimizing memory consumption}).
 
@@ -59,6 +64,28 @@
     we made it possible to tweak the position of each slot by modifying
     its attached properties (see \l {Advanced layout tweaks}).
 
+    \b Note that if you're wrapping the ListItemLayout in a container such
+    as \l {ListItem}, \b {you will have to specify the height of the container so that
+    it follows ListItemLayout's height}, otherwise the layout content may appear clipped or
+    not vertically centered.
+
+    See \b {\l {Resizing the layout} {here}} for more details. Here's an example:
+    \qml
+    import QtQuick 2.4
+    import Ubuntu.Component 1.3
+    ListItem {
+        //CORRECT, ListItem will be tall enough to accomodate all the content
+        height: layout.height + (divider.visible ? divider.height : 0)
+
+        ListItemLayout {
+            id: layout
+            title.text: "Hello developers!"
+            subtitle.text: "I am a ListItemLayout"
+            summary.text: "I resize automatically to accomodate all the elements I hold. My parents should track my height property!"
+        }
+    }
+    \endqml
+
     If you need a progression symbol in your list item,
     just add \l ProgressionSlot as a child of your ListItemLayout.
     No manual positioning is needed, the layout will handle it for you.
@@ -186,6 +213,39 @@
     to have the same height even without having to fill \l subtitle's (or summary's)
     text with dummy content.
 
+    \section1 Labels' properties
+
+    ListItemLayout's labels are the same component as \l {Label}, but with slightly different
+    default properties. Moreover, \l Label derives from \l {Text}. As a consequence,
+    you can access and override all the properties provided by \l {Text} and \l {Label}, if needed. Please
+    refer to \l {Text}'s and \l {Label}'s documentation to see the list of all the properties.
+
+    The default values for ListItemLayout's labels are defined in the documentation of each label.
+    See \l title, \l subtitle and \l summary.
+
+    \b Note: if you want to change the elide mode of a label to something other than \c Text.ElideRight,
+    make sure its \c wrapMode is set to \c Text.NoWrap. See \l Text::wrapMode for more details.
+
+    \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.3
+    Item {
+        width: units.gu(30)
+        height: units.gu(50)
+        ListItem {
+            height: layout.height + (divider.visible ? divider.height : 0)
+            ListItemLayout {
+                id: fileLayout
+                //Let's change the default elide mode to Text.ElideMiddle
+                title.elide: Text.ElideMiddle
+                //ElideMiddle only works if there is no wrapping (see Text::wrapMode doc)
+                title.wrapMode: Text.NoWrap
+                title.text: "Red Roses run no risk, sir, on nurses order."
+            }
+        }
+    }
+    \endqml
+
     \section1 Optimizing memory consumption
 
     In order to minimize memory consumption, the Labels in the \l SlotsLayout::mainSlot
@@ -221,6 +281,7 @@
 
     \qml
     ListItem {
+        height: layout.height + (divider.visible ? divider.height : 0)
         property alias titleText: layout.title.text
         ListItemLayout {
             id: layout
@@ -301,13 +362,28 @@
     Text component, as shown in the following example:
 
     \qml
-    Item {
-        ListItemLayout {
-            title.text: "Hello"
-            title.color: "yellow"
-        }
+    import QtQuick 2.4
+    import Ubuntu.Components 1.3
+    ListItemLayout {
+        height: units.gu(10)
+        width: units.gu(30)
+        title.color: UbuntuColors.orange
+        title.maximumLineCount: 3
+        title.text: "Red Roses\nrun no risk,\nsir, on nurses order."
     }
     \endqml
+
+    The default \l Text::elide value for \l title is \c Text.ElideRight.
+    
+    The default \l Text::wrapMode is \c Text.WrapAnywhere.
+    
+    That means, for instance, that if you want to use a different elide mode, you also have
+    to set wrapMode to \c Text.NoWrap. Refer to the official \l Text documentation for
+    further details.
+    
+    The default \l Label::textSize is \c Label.Medium.
+    
+    The rest of the properties have the same default values as \l Label.
 */
 UCLabel *UCListItemLayout::title()
 {
@@ -320,6 +396,14 @@
     This property defines the subtitle label and its properties.
     Styling and font properties can be set by using the prefix
     \c {subtitle.} in a similar way as shown in \l title.
+
+    The default \l Text::elide value for \l subtitle is \c Text.ElideRight.
+    
+    The default \l Text::wrapMode is \c Text.WrapAnywhere.
+    
+    The default \l Label::textSize is \c Label.Small.
+    
+    The rest of the properties have the same default values as \l Label.
 */
 UCLabel *UCListItemLayout::subtitle()
 {
@@ -332,6 +416,14 @@
     This property defines the subtitle label and its properties.
     Styling and font properties can be set by using the prefix
     \c {summary.} in a similar way as shown in \l title.
+
+    The default \l Text::elide value for \l summary is \c Text.ElideRight.
+    
+    The default \l Text::wrapMode is \c Text.WrapAnywhere.
+    
+    The default \l Label::textSize is \c Label.Small.
+    
+    The rest of the properties have the same default values as \l Label.
 */
 UCLabel *UCListItemLayout::summary()
 {
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp'
--- src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp	2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp	2016-08-14 09:05:30 +0000
@@ -703,7 +703,7 @@
     \qml
     ListItem {
         //CORRECT
-        height: layout.height + divider.height
+        height: layout.height + (divider.visible ? divider.height : 0)
 
         SlotsLayout {
             id: layout
@@ -765,7 +765,7 @@
 
     \qml
     ListItem {
-        height: layout.height + divider.height
+        height: layout.height + (divider.visible ? divider.height : 0)
         onClicked: console.log("clicked!")
 
         SlotsLayout {
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h'
--- src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h	2016-08-14 09:05:30 +0000
@@ -43,7 +43,7 @@
     Q_PROPERTY(bool activeFocusOnTab
             READ activeFocusOnTab2
             WRITE setActiveFocusOnTab2
-            NOTIFY activeFocusOnTabChanged2 FINAL)
+            NOTIFY activeFocusOnTabChanged2)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QQmlComponent *style READ style WRITE setStyle RESET resetStyle NOTIFY styleChanged FINAL DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QQuickItem *__styleInstance READ styleInstance NOTIFY styleInstanceChanged FINAL DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged FINAL REVISION 2)
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ucstylehints.cpp'
--- src/Ubuntu/UbuntuToolkit/ucstylehints.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/ucstylehints.cpp	2016-08-14 09:05:30 +0000
@@ -225,15 +225,18 @@
     m_propertyBackup.clear();
 
     QQuickItem *item = UCStyledItemBasePrivate::get(m_styledItem)->styleItem;
-    const QMetaObject *mo = item->metaObject();
     const QString styleName = UCStyledItemBasePrivate::get(m_styledItem)->styleName();
     // apply values first
     for (int i = 0; i < m_values.size(); i++) {
-        if (mo->indexOfProperty(m_values[i].first.toUtf8()) < 0) {
+        // Checking the validity of the property using the index of m_values[i].first in
+        //  item->metaObject is not sufficient in case of a grouped property, so we use
+        //  PropertyChange to detect all properties that are not valid.
+        PropertyChange *change = new PropertyChange(item, m_values[i].first.toUtf8());
+        if (!change->property().isValid()) {
             propertyNotFound(styleName, m_values[i].first);
+            delete change;
             continue;
         }
-        PropertyChange *change = new PropertyChange(item, m_values[i].first.toUtf8());
         PropertyChange::setValue(change, m_values[i].second);
         m_propertyBackup << change;
     }
 
=== modified file 'src/Ubuntu/UbuntuToolkit/ucunits.cpp'
--- src/Ubuntu/UbuntuToolkit/ucunits.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/ucunits.cpp	2016-08-14 09:05:30 +0000
@@ -71,16 +71,15 @@
 */
 
 /*
- * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
+ * In Qt5.6 the following variables affect scaling in QWidget and QML:
+ *   1. QT_SCALE_FACTOR: global integer scale factor, including point-sized fonts
+ *   2. QT_SCREEN_SCALE_FACTORS: a list of scale factors
+ *   3. QT_AUTO_SCREEN_SCALE_FACTOR: enables automatic scaling heuristics
  *
  * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
  * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
  * Qt-based UI, that includes QWidget as well as any QML UI.
  *
- * Setting QT_DEVICE_PIXEL_RATIO=2 implies one density-independent pixel corresponds to 2
- * physical pixels. Developers describe their UI in terms of density-independent pixels.
- * Qt scales accordingly.
- *
  * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
  * It offers more flexibility, but only scales QML applications written to use the UITK
  * (since it uses this Units class) as it is built on top of QML.
@@ -184,13 +183,17 @@
         return QString();
     }
 
-    QFileInfo fileInfo(path);
-    if (fileInfo.exists() && !fileInfo.isFile()) {
-        return QString();
+    const QFileInfo fileInfo(path);
+    if (fileInfo.exists()) {
+        if (fileInfo.isFile()) {
+            return QStringLiteral("1/") + path;
+        } else {
+            return QString();
+        }
     }
 
-    QString prefix = fileInfo.dir().absolutePath() + "/" + fileInfo.baseName();
-    QString suffix = "." + fileInfo.completeSuffix();
+    const QString prefix = fileInfo.dir().absolutePath() + "/" + fileInfo.baseName();
+    const QString suffix = "." + fileInfo.completeSuffix();
 
     /* Use file with expected grid unit suffix if it exists.
        For example, if m_gridUnit = 10, look for [e-mail].
@@ -198,7 +201,7 @@
 
     path = prefix + suffixForGridUnit(m_gridUnit) + suffix;
     if (QFile::exists(path)) {
-        return QString("1") + "/" + path;
+        return QStringLiteral("1/") + path;
     }
 
     /* No file with expected grid unit suffix exists.
@@ -219,7 +222,7 @@
     */
     QStringList nameFilters;
     nameFilters << fileInfo.baseName() + "@[0-9]*" + suffix;
-    QStringList files = fileInfo.dir().entryList(nameFilters, QDir::Files);
+    const QStringList files = fileInfo.dir().entryList(nameFilters, QDir::Files);
 
     if (!files.empty()) {
         float selectedGridUnitSuffix = gridUnitSuffixFromFileName(files.first());
@@ -237,11 +240,6 @@
         return QString::number(scaleFactor) + "/" + path;
     }
 
-    path = prefix + suffix;
-    if (QFile::exists(path)) {
-        return QString("1") + "/" + path;
-    }
-
     return QString();
 }
 
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py	2015-12-07 13:30:11 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py	2016-08-14 09:05:30 +0000
@@ -62,6 +62,9 @@
         try:
             object_name = action_object_name + "_button"
             button = self.select_single(objectName=object_name)
+            # In an animating header, the button is disabled until the header
+            #   animation is done. Wait for that:
+            button.enabled.wait_for(True)
             self.pointing_device.click_object(button)
         except dbus.StateNotFoundError:
             # the button is not in the ActionBar, but it may be in the overflow
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2016-04-21 03:23:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2016-08-14 09:05:30 +0000
@@ -261,6 +261,9 @@
         except dbus.StateNotFoundError:
             # for Ubuntu.Components < 1.3
             button = self._get_action_button(action_object_name)
+            # In an animating header, the button is disabled until the header
+            #   animation is done. Wait for that:
+            button.enabled.wait_for(True)
             self.pointing_device.click_object(button)
         except _common.ToolkitException:
             # Catch 'Button not found in ActionBar or overflow' exception
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py	2014-07-16 19:19:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py	2016-08-14 09:05:30 +0000
@@ -40,7 +40,7 @@
         option_selector_delegate = self.select_single(
             'OptionSelectorDelegate', focus='True')
         current_label = option_selector_delegate.select_single(
-            'Label', visible='True')
+            'UCLabel', visible='True')
         return current_label.text
 
     def get_current_label(self):
@@ -48,7 +48,7 @@
         option_selector_delegate = self.select_single(
             'OptionSelectorDelegate', focus='True')
         current_label = option_selector_delegate.select_single(
-            'Label', visible='True')
+            'UCLabel', visible='True')
         return current_label
 
     def _expand(self):
@@ -69,7 +69,7 @@
 
         Example usage::
             select_option(objectName="myOptionSelectorDelegate")
-            select_option('Label', text="some_text_here")
+            select_option('UCLabel', text="some_text_here")
 
         :parameter kwargs: keywords used to find property(s) of delegate in
             option selector
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py	2016-06-21 05:51:15 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py	2016-08-14 09:05:30 +0000
@@ -98,8 +98,7 @@
         self.pointing_device.click_object(button)
 
     def _get_button(self, object_name):
-        return self.select_single(
-            'UbuntuToolkit::UCActionItem', objectName=object_name)
+        return self.select_single(objectName=object_name)
 
     @autopilot_logging.log_action(logger.info)
     def click_back_button(self):
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2016-06-21 18:55:01 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2016-08-14 09:05:30 +0000
@@ -98,7 +98,12 @@
             button = self.select_single(objectName=object_name)
         except dbus.StateNotFoundError:
             raise _common.ToolkitException(
-                'Action with objectName "{0}" not found.'.format(object_name))
+                'Button for action with objectName "{0}" not found.'.format(
+                    action_object_name))
+        if not button.visible:
+            raise _common.ToolkitException(
+                'Button for action with objectName "{0}" not visible.'.format(
+                    action_object_name))
         self.pointing_device.click_object(button)
         if self.autoClose:
             try:
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_checkbox.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_checkbox.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_checkbox.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Item {
+        CheckBox {
+            checked: false
+            objectName: "test_checkbox"
+        }
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_switch.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_switch.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_switch.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Item {
+        Switch {
+            checked: false
+            objectName: "test_switch"
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py	2016-08-14 09:05:30 +0000
@@ -15,6 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import time
+import os
 
 from autopilot import input
 from testtools.matchers import GreaterThan, LessThan
@@ -24,51 +25,22 @@
 from ubuntuuitoolkit import tests
 
 
-TEST_QML_WITH_CHECKBOX = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Item {
-        CheckBox {
-            checked: false
-            objectName: "test_checkbox"
-        }
-    }
-}
-""")
-
-
-TEST_QML_WITH_SWITCH = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Item {
-        Switch {
-            checked: false
-            objectName: "test_switch"
-        }
-    }
-}
-""")
-
-
-class ToggleTestCase(tests.QMLStringAppTestCase):
+class ToggleTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    switch_test_qml_file_path = os.path.join(
+        dir_path, 'test_checkbox.ToggleTestCase.test_with_switch.qml')
+    checkbox_test_qml_file_path = os.path.join(
+        dir_path, 'test_checkbox.ToggleTestCase.test_with_checkbox.qml')
 
     scenarios = [
         ('checkbox', dict(
-            test_qml=TEST_QML_WITH_CHECKBOX, objectName='test_checkbox')),
+            test_qml_file_path=checkbox_test_qml_file_path,
+            objectName='test_checkbox')),
         ('switch', dict(
-            test_qml=TEST_QML_WITH_SWITCH, objectName='test_switch'))
+            test_qml_file_path=switch_test_qml_file_path,
+            objectName='test_switch'))
     ]
 
     def setUp(self):
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py	2016-08-14 09:05:30 +0000
@@ -41,6 +41,8 @@
             ubuntuuitoolkit.check_autopilot_version()
 
 
+# FIXME: this class is not used anywhere, and QMLStringAppTestCase subclasses
+#   no longer work (see bug 1578319), so the code below can be deleted.
 class UbuntuUIToolkitCustomProxyObjectBaseTestCase(tests.QMLStringAppTestCase):
 
     def test_pointing_device(self):
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.DatePickerBaseTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.DatePickerBaseTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.DatePickerBaseTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Pickers 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Column {
+        DatePicker {
+            id: datePicker
+            objectName: 'datePicker'
+            mode: 'Years|Months|Days'
+            maximum: {
+                var d = new Date()
+                d.setFullYear('2030')
+                return d
+            }
+            minimum: {
+                var d = new Date()
+                d.setFullYear('1990')
+                return d
+            }
+            date: {
+                var d = new Date()
+                d.setFullYear('2010')
+                d.setMonth('5')
+                d.setDate('15')
+                return d
+            }
+        }
+        DatePicker {
+            id: timePicker
+            objectName: 'timePicker'
+            mode: 'Hours|Minutes|Seconds'
+            maximum: {
+                var d = new Date()
+                d.setFullYear('2030')
+                return d
+            }
+            minimum: {
+                var d = new Date()
+                d.setFullYear('1990')
+                return d
+            }
+            date: {
+                var d = new Date()
+                d.setHours(12)
+                d.setMinutes('30')
+                d.setSeconds('30')
+                return d
+            }
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2016-08-14 09:05:30 +0000
@@ -14,72 +14,19 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import datetime
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import pickers, tests
 
 
-class DatePickerBaseTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Pickers 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Column {
-        DatePicker {
-            id: datePicker
-            objectName: 'datePicker'
-            mode: 'Years|Months|Days'
-            maximum: {
-                var d = new Date()
-                d.setFullYear('2030')
-                return d
-            }
-            minimum: {
-                var d = new Date()
-                d.setFullYear('1990')
-                return d
-            }
-            date: {
-                var d = new Date()
-                d.setFullYear('2010')
-                d.setMonth('5')
-                d.setDate('15')
-                return d
-            }
-        }
-        DatePicker {
-            id: timePicker
-            objectName: 'timePicker'
-            mode: 'Hours|Minutes|Seconds'
-            maximum: {
-                var d = new Date()
-                d.setFullYear('2030')
-                return d
-            }
-            minimum: {
-                var d = new Date()
-                d.setFullYear('1990')
-                return d
-            }
-            date: {
-                var d = new Date()
-                d.setHours(12)
-                d.setMinutes('30')
-                d.setSeconds('30')
-                return d
-            }
-        }
-    }
-}
-""")
+class DatePickerBaseTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_date_picker.DatePickerBaseTestCase.qml')
 
     def setUp(self):
         super().setUp()
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.IsFlickableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.IsFlickableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.IsFlickableTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    objectName: 'mainView'
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Flickable {
+        objectName: 'flickable'
+    }
+    ListView {
+        objectName: 'listView'
+    }
+    Label {
+        objectName: 'label'
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.SwipeFlickableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.SwipeFlickableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.SwipeFlickableTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Label {
+        id: clickedLabel
+        objectName: "clickedLabel"
+        text: "No element clicked."
+    }
+
+    Flickable {
+        anchors {
+            fill: parent
+            topMargin: clickedLabel.height
+        }
+        objectName: 'flickable'
+        height: units.gu(60)
+        contentHeight: bottomButton.y + bottomButton.height
+        contentWidth: topRightButton.x +
+            Math.max(topRightButton.width, bottomRightButton.width)
+
+        Button {
+            id: topButton
+            objectName: 'topButton'
+            text: 'Top button'
+            onClicked: clickedLabel.text = objectName
+        }
+        Rectangle {
+            id: emptyRectangle
+            width: units.gu(70)
+            height: units.gu(80)
+            anchors.top: topButton.bottom
+        }
+        Button {
+            id: bottomButton
+            objectName: 'bottomButton'
+            text: 'Bottom button'
+            onClicked: clickedLabel.text = objectName
+            anchors.top: emptyRectangle.bottom
+        }
+        Button {
+            id: topRightButton
+            objectName: 'topRightButton'
+            text: 'Top-right button'
+            onClicked: clickedLabel.text = objectName
+            anchors {
+                top: parent.top
+                left: emptyRectangle.right
+            }
+        }
+        Button {
+            id: bottomRightButton
+            objectName: 'bottomRightButton'
+            text: 'Bottom-right button'
+            onClicked: clickedLabel.text = objectName
+            anchors {
+                top: emptyRectangle.bottom
+                left: emptyRectangle.right
+            }
+        }
+    }
+}
+
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.UnityFlickableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.UnityFlickableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.UnityFlickableTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: 'mainView'
+
+    Flickable {
+        objectName: 'testFlickable'
+        width: 200; height: 200
+        contentWidth: image.width; contentHeight: image.height
+    }
+}
+
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2016-01-18 14:51:22 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2016-08-14 09:05:30 +0000
@@ -16,6 +16,7 @@
 
 from unittest import mock
 
+import os
 import testtools
 import ubuntuuitoolkit
 from ubuntuuitoolkit import (
@@ -49,7 +50,7 @@
             self.assertFalse(element.is_flickable())
 
 
-class IsFlickableTestCase(tests.QMLStringAppTestCase):
+class IsFlickableTestCase(tests.QMLFileAppTestCase):
     """Functional test to check that is_flickable returns the right value.
 
     We already have tests for is_flickable with mocks, so here we just check
@@ -57,26 +58,10 @@
 
     """
 
-    test_qml = ("""
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-MainView {
-    objectName: 'mainView'
-    width: units.gu(48)
-    height: units.gu(60)
-
-    Flickable {
-        objectName: 'flickable'
-    }
-    ListView {
-        objectName: 'listView'
-    }
-    Label {
-        objectName: 'label'
-    }
-}
-""")
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_flickable.IsFlickableTestCase.qml')
 
     scenarios = [
         ('main view', dict(object_name='mainView', is_flickable=False)),
@@ -93,76 +78,12 @@
 
 # FIXME: Only left-to-right (where x=0 is leftmost) layouts are taken into
 #   account. Add support for horizontal flicking with right-to-left layouts.
-class SwipeFlickableTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Label {
-        id: clickedLabel
-        objectName: "clickedLabel"
-        text: "No element clicked."
-    }
-
-    Flickable {
-        anchors {
-            fill: parent
-            topMargin: clickedLabel.height
-        }
-        objectName: 'flickable'
-        height: units.gu(60)
-        contentHeight: bottomButton.y + bottomButton.height
-        contentWidth: topRightButton.x +
-            Math.max(topRightButton.width, bottomRightButton.width)
-
-        Button {
-            id: topButton
-            objectName: 'topButton'
-            text: 'Top button'
-            onClicked: clickedLabel.text = objectName
-        }
-        Rectangle {
-            id: emptyRectangle
-            width: units.gu(70)
-            height: units.gu(80)
-            anchors.top: topButton.bottom
-        }
-        Button {
-            id: bottomButton
-            objectName: 'bottomButton'
-            text: 'Bottom button'
-            onClicked: clickedLabel.text = objectName
-            anchors.top: emptyRectangle.bottom
-        }
-        Button {
-            id: topRightButton
-            objectName: 'topRightButton'
-            text: 'Top-right button'
-            onClicked: clickedLabel.text = objectName
-            anchors {
-                top: parent.top
-                left: emptyRectangle.right
-            }
-        }
-        Button {
-            id: bottomRightButton
-            objectName: 'bottomRightButton'
-            text: 'Bottom-right button'
-            onClicked: clickedLabel.text = objectName
-            anchors {
-                top: emptyRectangle.bottom
-                left: emptyRectangle.right
-            }
-        }
-    }
-}
-""")
+class SwipeFlickableTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_flickable.SwipeFlickableTestCase.qml')
 
     def setUp(self):
         super().setUp()
@@ -393,24 +314,12 @@
         self.assertEqual('Could not swipe in the flickable.', str(error))
 
 
-class UnityFlickableTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: 'mainView'
-
-    Flickable {
-        objectName: 'testFlickable'
-        width: 200; height: 200
-        contentWidth: image.width; contentHeight: image.height
-    }
-}
-""")
+class UnityFlickableTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_flickable.UnityFlickableTestCase.qml')
 
     def get_command_line(self, command_line):
         command_line.append('-engine')
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.IsFlickableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.IsFlickableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.IsFlickableTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+MainView {
+    objectName: 'mainView'
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Flickable {
+        objectName: 'flickable'
+    }
+    ListView {
+        objectName: 'listView'
+    }
+    Label {
+        objectName: 'label'
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.SwipeFlickableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.SwipeFlickableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.SwipeFlickableTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Label {
+        id: clickedLabel
+        objectName: "clickedLabel"
+        text: "No element clicked."
+    }
+
+    Flickable {
+        anchors {
+            fill: parent
+            topMargin: clickedLabel.height
+            // It can't be at the bottom, or the toolbar will be opened
+            // when we try to click it.
+            bottomMargin: units.gu(10)
+        }
+        objectName: 'flickable'
+        height: units.gu(60)
+        contentHeight: bottomButton.y + bottomButton.height
+
+        Button {
+            id: topButton
+            objectName: 'topButton'
+            text: 'Top button'
+            onClicked: clickedLabel.text = objectName
+        }
+        Rectangle {
+            id: emptyRectangle
+            height: units.gu(80)
+            anchors.top: topButton.bottom
+        }
+        Button {
+            id: bottomButton
+            objectName: 'bottomButton'
+            text: 'Bottom button'
+            onClicked: clickedLabel.text = objectName
+            anchors.top: emptyRectangle.bottom
+        }
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.UnityFlickableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.UnityFlickableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.UnityFlickableTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: 'mainView'
+
+    Flickable {
+        objectName: 'testFlickable'
+        width: 200; height: 200
+        contentWidth: image.width; contentHeight: image.height
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.py	2016-01-18 15:39:13 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.py	2016-08-14 09:05:30 +0000
@@ -15,6 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from unittest import mock
+import os
 
 import testtools
 import ubuntuuitoolkit
@@ -49,7 +50,7 @@
             self.assertFalse(element.is_flickable())
 
 
-class IsFlickableTestCase(tests.QMLStringAppTestCase):
+class IsFlickableTestCase(tests.QMLFileAppTestCase):
     """Functional test to check that is_flickable returns the right value.
 
     We already have tests for is_flickable with mocks, so here we just check
@@ -57,27 +58,10 @@
 
     """
 
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-MainView {
-    objectName: 'mainView'
-    width: units.gu(48)
-    height: units.gu(60)
-
-    Flickable {
-        objectName: 'flickable'
-    }
-    ListView {
-        objectName: 'listView'
-    }
-    Label {
-        objectName: 'label'
-    }
-}
-""")
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_flickable_uitk10.IsFlickableTestCase.qml')
 
     scenarios = [
         ('main view', dict(object_name='mainView', is_flickable=False)),
@@ -92,56 +76,12 @@
         self.assertEqual(element.is_flickable(), self.is_flickable)
 
 
-class SwipeFlickableTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Label {
-        id: clickedLabel
-        objectName: "clickedLabel"
-        text: "No element clicked."
-    }
-
-    Flickable {
-        anchors {
-            fill: parent
-            topMargin: clickedLabel.height
-            // It can't be at the bottom, or the toolbar will be opened
-            // when we try to click it.
-            bottomMargin: units.gu(10)
-        }
-        objectName: 'flickable'
-        height: units.gu(60)
-        contentHeight: bottomButton.y + bottomButton.height
-
-        Button {
-            id: topButton
-            objectName: 'topButton'
-            text: 'Top button'
-            onClicked: clickedLabel.text = objectName
-        }
-        Rectangle {
-            id: emptyRectangle
-            height: units.gu(80)
-            anchors.top: topButton.bottom
-        }
-        Button {
-            id: bottomButton
-            objectName: 'bottomButton'
-            text: 'Bottom button'
-            onClicked: clickedLabel.text = objectName
-            anchors.top: emptyRectangle.bottom
-        }
-    }
-}
-""")
+class SwipeFlickableTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_flickable_uitk10.SwipeFlickableTestCase.qml')
 
     def setUp(self):
         super().setUp()
@@ -271,24 +211,12 @@
         self.assertEqual('Could not swipe in the flickable.', str(error))
 
 
-class UnityFlickableTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: 'mainView'
-
-    Flickable {
-        objectName: 'testFlickable'
-        width: 200; height: 200
-        contentWidth: image.width; contentHeight: image.height
-    }
-}
-""")
+class UnityFlickableTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_flickable_uitk10.UnityFlickableTestCase.qml')
 
     def get_command_line(self, command_line):
         command_line.append('-engine')
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.SwipeToDeleteTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.SwipeToDeleteTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.SwipeToDeleteTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Page {
+
+        ListModel {
+            id: testModel
+
+            ListElement {
+                name: "listitem_destroyed_on_remove_with_confirm"
+                label: "Item destroyed on remove with confirmation"
+                confirm: true
+            }
+            ListElement {
+                name: "listitem_destroyed_on_remove_without_confirm"
+                label: "Item destroyed on remove without confirmation"
+                confirm: false
+            }
+        }
+
+        Column {
+            anchors { fill: parent }
+
+            Standard {
+                objectName: "listitem_standard"
+                confirmRemoval: true
+                removable: true
+                text: 'Slide to remove'
+            }
+
+            Empty {
+                objectName: "listitem_empty"
+            }
+
+            Standard {
+                objectName: "listitem_without_confirm"
+                confirmRemoval: false
+                removable: true
+                text: "Item without delete confirmation"
+            }
+
+            ListView {
+                anchors { left: parent.left; right: parent.right }
+                height: childrenRect.height
+                model: testModel
+
+                delegate: Standard {
+                    removable: true
+                    confirmRemoval: confirm
+                    onItemRemoved: testModel.remove(index)
+                    text: label
+                    objectName: name
+                }
+            }
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2016-08-14 09:05:30 +0000
@@ -48,74 +48,12 @@
             listitems.Subtitled, listitems.Base))
 
 
-class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.ListItems 1.0
-
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Page {
-
-        ListModel {
-            id: testModel
-
-            ListElement {
-                name: "listitem_destroyed_on_remove_with_confirm"
-                label: "Item destroyed on remove with confirmation"
-                confirm: true
-            }
-            ListElement {
-                name: "listitem_destroyed_on_remove_without_confirm"
-                label: "Item destroyed on remove without confirmation"
-                confirm: false
-            }
-        }
-
-        Column {
-            anchors { fill: parent }
-
-            Standard {
-                objectName: "listitem_standard"
-                confirmRemoval: true
-                removable: true
-                text: 'Slide to remove'
-            }
-
-            Empty {
-                objectName: "listitem_empty"
-            }
-
-            Standard {
-                objectName: "listitem_without_confirm"
-                confirmRemoval: false
-                removable: true
-                text: "Item without delete confirmation"
-            }
-
-            ListView {
-                anchors { left: parent.left; right: parent.right }
-                height: childrenRect.height
-                model: testModel
-
-                delegate: Standard {
-                    removable: true
-                    confirmRemoval: confirm
-                    onItemRemoved: testModel.remove(index)
-                    text: label
-                    objectName: name
-                }
-            }
-        }
-    }
-}
-""")
+class SwipeToDeleteTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_listitems.SwipeToDeleteTestCase.qml')
 
     def setUp(self):
         super().setUp()
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_header.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_header.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_header.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+    useDeprecatedToolbar: false
+
+    PageStack {
+        id: pageStack
+        Component.onCompleted: push(page0)
+
+        Page {
+            id: page0
+            title: "Page 0"
+            visible: false
+
+            Button {
+                objectName: "go_to_page1"
+                text: "Go to page 1"
+                onClicked: pageStack.push(page1)
+            }
+        }
+
+        Page {
+            id: page1
+            title: "Page 1"
+            visible: false
+        }
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_toolbar.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_toolbar.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_toolbar.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+    useDeprecatedToolbar: true
+
+    PageStack {
+        id: pageStack
+        Component.onCompleted: push(page0)
+
+        Page {
+            id: page0
+            title: "Page 0"
+            visible: false
+
+            Button {
+                objectName: "go_to_page1"
+                text: "Go to page 1"
+                onClicked: pageStack.push(page1)
+            }
+        }
+
+        Page {
+            id: page1
+            title: "Page 1"
+            visible: false
+        }
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView10TestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView10TestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView10TestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView12TestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView12TestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView12TestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.2
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2015-09-22 15:56:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2016-08-14 09:05:30 +0000
@@ -14,24 +14,19 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
 from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
 
-class MainView10TestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-}
-""")
+class MainView10TestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_main_view.MainView10TestCase.qml')
 
     def test_main_view_custom_proxy_object(self):
         self.assertIsInstance(self.main_view, ubuntuuitoolkit.MainView)
@@ -75,18 +70,12 @@
             str(error), 'The MainView has no Tabs.')
 
 
-class MainView12TestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.3
-import Ubuntu.Components 1.2
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-}
-""")
+class MainView12TestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_main_view.MainView12TestCase.qml')
 
     def test_main_view_custom_proxy_object(self):
         self.assertIsInstance(self.main_view, ubuntuuitoolkit.MainView)
@@ -128,51 +117,20 @@
             str(error), 'The MainView has no Toolbar.')
 
 
-TEST_GO_BACK_QML_FORMAT = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {{
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-    useDeprecatedToolbar: {use_deprecated_toolbar}
-
-    PageStack {{
-        id: pageStack
-        Component.onCompleted: push(page0)
-
-        Page {{
-            id: page0
-            title: "Page 0"
-            visible: false
-
-            Button {{
-                objectName: "go_to_page1"
-                text: "Go to page 1"
-                onClicked: pageStack.push(page1)
-            }}
-        }}
-
-        Page {{
-            id: page1
-            title: "Page 1"
-            visible: false
-        }}
-    }}
-}}
-""")
-
-
-class GoBackTestCase(tests.QMLStringAppTestCase):
+class GoBackTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    toolbar_test_qml_file_path = os.path.join(
+        dir_path, 'test_main_view.GoBackTestCase.back_in_toolbar.qml')
+    header_test_qml_file_path = os.path.join(
+        dir_path, 'test_main_view.GoBackTestCase.back_in_header.qml')
 
     scenarios = [
-        ('back in toolbar', dict(
-            test_qml=TEST_GO_BACK_QML_FORMAT.format(
-                use_deprecated_toolbar='true'))),
-        ('back in header', dict(
-            test_qml=TEST_GO_BACK_QML_FORMAT.format(
-                use_deprecated_toolbar='false')))
+        ('back_in_toolbar', dict(
+            test_qml_file_path=toolbar_test_qml_file_path)),
+        ('back_in_header', dict(
+            test_qml_file_path=header_test_qml_file_path))
     ]
 
     def setUp(self):
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorCustomDelegateTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorCustomDelegateTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorCustomDelegateTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Page{
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.fill: parent
+
+            spacing: units.gu(3)
+
+            Component {
+                id: valueSelectorDelegate
+                OptionSelectorDelegate {
+                    text: label
+                    objectName: name
+                }
+            }
+
+            ListModel {
+                id: valueModel
+                ListElement { name: "one"; label: "Value 1" }
+                ListElement { name: "two"; label: "Value 2" }
+                ListElement { name: "three"; label: "Value 3" }
+                ListElement { name: "four"; label: "Value 4" }
+                ListElement { name: "five"; label: "Value 5" }
+            }
+
+            OptionSelector {
+                id: valueSelector
+                objectName: "test_option_selector_collapsed"
+                text: "Collapsed"
+                delegate: valueSelectorDelegate
+                model: valueModel
+            }
+        }
+    }
+}
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(120)
+    objectName: "mainView"
+
+    Column {
+        anchors.fill: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
+        spacing: units.gu(3)
+
+        OptionSelector {
+            objectName: "option_selector"
+            text: i18n.tr("option_selector")
+            expanded: true
+            model: [i18n.tr("Red"),
+                i18n.tr("Blue"),
+                i18n.tr("Green"),
+                i18n.tr("Yellow"),
+                i18n.tr("Black")]
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py	2016-08-14 09:05:30 +0000
@@ -14,58 +14,18 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
 
-class OptionSelectorCustomDelegateTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Page{
-
-        Column {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.fill: parent
-
-            spacing: units.gu(3)
-
-            Component {
-                id: valueSelectorDelegate
-                OptionSelectorDelegate {
-                    text: label
-                    objectName: name
-                }
-            }
-
-            ListModel {
-                id: valueModel
-                ListElement { name: "one"; label: "Value 1" }
-                ListElement { name: "two"; label: "Value 2" }
-                ListElement { name: "three"; label: "Value 3" }
-                ListElement { name: "four"; label: "Value 4" }
-                ListElement { name: "five"; label: "Value 5" }
-            }
-
-            OptionSelector {
-                id: valueSelector
-                objectName: "test_option_selector_collapsed"
-                text: "Collapsed"
-                delegate: valueSelectorDelegate
-                model: valueModel
-            }
-        }
-    }
-}
-""")
+class OptionSelectorCustomDelegateTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path,
+        'test_optionselector.OptionSelectorCustomDelegateTestCase.qml')
 
     def setUp(self):
         super().setUp()
@@ -119,36 +79,12 @@
         self.assertEqual(2, self.option_selector.selectedIndex)
 
 
-class OptionSelectorTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(120)
-    objectName: "mainView"
-
-        Column {
-           anchors.fill: parent
-           anchors.left: parent.left
-           anchors.right: parent.right
-           spacing: units.gu(3)
-
-                OptionSelector {
-                    objectName: "option_selector"
-                    text: i18n.tr("option_selector")
-                    expanded: true
-                    model: [i18n.tr("Red"),
-                            i18n.tr("Blue"),
-                            i18n.tr("Green"),
-                            i18n.tr("Yellow"),
-                            i18n.tr("Black")]
-                }
-        }
-}
-""")
+class OptionSelectorTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_optionselector.OptionSelectorTestCase.qml')
 
     def setUp(self):
         super().setUp()
@@ -176,23 +112,23 @@
 
     def test_select_option(self):
         """select_text() must select the text in the OptionSelector"""
-        self.option_selector.select_option('Label', text="Green")
+        self.option_selector.select_option('UCLabel', text="Green")
         self.assertEqual(2, self.option_selector.selectedIndex)
 
     def test_get_selected_text(self):
         """get_selected_text() must return the text selected item"""
-        self.option_selector.select_option('Label', text="Blue")
+        self.option_selector.select_option('UCLabel', text="Blue")
         self.assertEqual(1, self.option_selector.selectedIndex)
         self.assertEqual(
             self.option_selector.get_selected_text(), "Blue")
 
     def test_same_item_2_times(self):
         """Emulator must be able to select 2 items in a row"""
-        self.option_selector.select_option('Label', text="Green")
+        self.option_selector.select_option('UCLabel', text="Green")
         self.assertEqual(
             self.option_selector.get_selected_text(), "Green")
         self.assertEqual(2, self.option_selector.selectedIndex)
-        self.option_selector.select_option('Label', text="Green")
+        self.option_selector.select_option('UCLabel', text="Green")
         self.assertEqual(
             self.option_selector.get_selected_text(), "Green")
         self.assertEqual(2, self.option_selector.selectedIndex)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ActionSelectionPopoverTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ActionSelectionPopoverTestCase.qml	2015-10-01 12:26:23 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ActionSelectionPopoverTestCase.qml	2016-08-14 09:05:30 +0000
@@ -48,11 +48,13 @@
             Action {
                 text: "Action two"
                 objectName: "actionDisabled"
+                enabled: false
                 onTriggered: label.text = "Disabled button clicked."
             }
             Action {
                 text: "Action three"
                 objectName: "actionHidden"
+                visible: false
                 onTriggered: label.text = "Hidden button clicked."
             }
         }
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ComposerSheetTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ComposerSheetTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ComposerSheetTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+import Ubuntu.Components.Popups 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Button {
+        objectName: "openComposerSheetButton"
+        text: "Open Composer Sheet"
+        onClicked: PopupUtils.open(testComposerSheet);
+    }
+
+    Label {
+        id: "label"
+        objectName: "actionLabel"
+        anchors.centerIn: parent
+        text: "No action taken."
+    }
+
+    Component {
+        id: testComposerSheet
+        ComposerSheet {
+            id: sheet
+            objectName: "testComposerSheet"
+            onCancelClicked: {
+                label.text = "Cancel selected."
+            }
+            onConfirmClicked: {
+                label.text = "Confirm selected."
+            }
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2015-09-30 15:10:11 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2016-08-14 09:05:30 +0000
@@ -23,6 +23,8 @@
 
 class ActionSelectionPopoverTestCase(tests.QMLFileAppTestCase):
 
+    # FIXME: Currently we are only testing UITK 1.0 Popups,
+    #   we need to test 1.3 as well. See bug 1612582.
     path = os.path.abspath(__file__)
     dir_path = os.path.dirname(path)
     test_qml_file_path = os.path.join(
@@ -60,7 +62,7 @@
             popover.click_action_button, 'actionTwo')
         self.assertEqual(
             str(error),
-            'Action with objectName "actionTwo" not found.')
+            'Button for action with objectName "actionTwo" not found.')
 
     def test_click_disabled_button_by_object_name(self):
         self._open_popover()
@@ -72,7 +74,7 @@
             popover.click_action_button, 'actionDisabled')
         self.assertEqual(
             str(error),
-            'Action with objectName "actionDisabled" not found.')
+            'Button for action with objectName "actionDisabled" not visible.')
 
     def test_click_hidden_button_by_object_name(self):
         self._open_popover()
@@ -83,7 +85,7 @@
             popover.click_action_button, 'actionHidden')
         self.assertEqual(
             str(error),
-            'Action with objectName "actionHidden" not found.')
+            'Button for action with objectName "actionHidden" not visible.')
 
     def _open_popover(self):
         open_button = self.main_view.select_single(
@@ -110,46 +112,12 @@
             str(error), 'The popover is not open.')
 
 
-class ComposerSheetTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.Popups 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Button {
-        objectName: "openComposerSheetButton"
-        text: "Open Composer Sheet"
-        onClicked: PopupUtils.open(testComposerSheet);
-    }
-
-    Label {
-        id: "label"
-        objectName: "actionLabel"
-        anchors.centerIn: parent
-        text: "No action taken."
-    }
-
-    Component {
-        id: testComposerSheet
-        ComposerSheet {
-            id: sheet
-            objectName: "testComposerSheet"
-            onCancelClicked: {
-                label.text = "Cancel selected."
-            }
-            onConfirmClicked: {
-                label.text = "Confirm selected."
-            }
-        }
-    }
-}
-""")
+class ComposerSheetTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_popups.ComposerSheetTestCase.qml')
 
     def setUp(self):
         super().setUp()
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.QQuickListViewOutOfViewTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.QQuickListViewOutOfViewTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.QQuickListViewOutOfViewTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(20)
+    objectName: "mainView"
+
+    Page {
+
+        Flickable {
+
+            Column {
+                id: column
+                width: units.gu(48)
+                // The column height is greater than the main view height, so
+                // the bottom of the list is out of view.
+                height: units.gu(40)
+
+                Label {
+                    id: clickedLabel
+                    objectName: "clickedLabel"
+                    text: "No element clicked."
+                }
+
+                ListView {
+                    id: testListView
+                    objectName: "testListView"
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    height: column.height - clickedLabel.paintedHeight
+                    clip: true
+                    model: 20
+
+                    delegate: ListItem.Standard {
+                        objectName: "testListElement%1".arg(index)
+                        text: "test list element %1".arg(index)
+                        onClicked: clickedLabel.text = objectName
+                        height: units.gu(5)
+                    }
+                }
+            }
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2016-01-20 17:35:53 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2016-08-14 09:05:30 +0000
@@ -150,57 +150,13 @@
             str(error), 'List element with objectName "unexisting" not found.')
 
 
-class QQuickListViewOutOfViewTestCase(tests.QMLStringAppTestCase):
+class QQuickListViewOutOfViewTestCase(tests.QMLFileAppTestCase):
     """Test that we can make elements visible when the list is out of view."""
 
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(20)
-    objectName: "mainView"
-
-    Page {
-
-        Flickable {
-
-            Column {
-                id: column
-                width: units.gu(48)
-                // The column height is greater than the main view height, so
-                // the bottom of the list is out of view.
-                height: units.gu(40)
-
-                Label {
-                    id: clickedLabel
-                    objectName: "clickedLabel"
-                    text: "No element clicked."
-                }
-
-                ListView {
-                    id: testListView
-                    objectName: "testListView"
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    height: column.height - clickedLabel.paintedHeight
-                    clip: true
-                    model: 20
-
-                    delegate: ListItem.Standard {
-                        objectName: "testListElement%1".arg(index)
-                        text: "test list element %1".arg(index)
-                        onClicked: clickedLabel.text = objectName
-                        height: units.gu(5)
-                    }
-                }
-            }
-        }
-    }
-}
-""")
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_qquicklistview.QQuickListViewOutOfViewTestCase.qml')
 
     def setUp(self):
         super().setUp()
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.TextAreaTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.TextAreaTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.TextAreaTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Item {
+        TextArea {
+            objectName: "simple_text_area"
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2015-06-17 15:06:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2016-08-14 09:05:30 +0000
@@ -14,30 +14,19 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
 from testtools.matchers import GreaterThan
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
 
-class TextAreaTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-    objectName: "mainView"
-
-    Item {
-        TextArea {
-            objectName: "simple_text_area"
-        }
-    }
-}
-""")
+class TextAreaTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_textarea.TextAreaTestCase.qml')
 
     def setUp(self):
         super().setUp()
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.ToolbarTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.ToolbarTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.ToolbarTestCase.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+
+MainView {
+    width: units.gu(50)
+    height: units.gu(50)
+    objectName: "mainView"
+
+    // Make sure that for these tests the toolbar starts closed.
+    Component.onCompleted: {
+        __propagated.toolbar.close();
+    }
+
+    Page {
+
+        Label {
+            id: "label"
+            objectName: "clicked_label"
+            anchors.centerIn: parent
+            text: "Button not clicked."
+        }
+
+        tools: ToolbarItems {
+            ToolbarButton {
+                objectName: "buttonName"
+                action: Action {
+                    text: "buttonText"
+                    onTriggered: label.text = "Button clicked."
+                }
+            }
+        }
+    }
+}
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py	2016-08-14 09:05:30 +0000
@@ -14,49 +14,19 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
 from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
 
-class ToolbarTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(50)
-    objectName: "mainView"
-
-    // Make sure that for these tests the toolbar starts closed.
-    Component.onCompleted: {
-        __propagated.toolbar.close();
-    }
-
-    Page {
-
-        Label {
-            id: "label"
-            objectName: "clicked_label"
-            anchors.centerIn: parent
-            text: "Button not clicked."
-        }
-
-        tools: ToolbarItems {
-            ToolbarButton {
-                objectName: "buttonName"
-                action: Action {
-                    text: "buttonText"
-                    onTriggered: label.text = "Button clicked."
-                }
-            }
-        }
-    }
-}
-""")
+class ToolbarTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_toolbar.ToolbarTestCase.qml')
 
     def setUp(self):
         super().setUp()
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-10-04 13:20:26 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2016-08-14 09:05:30 +0000
@@ -35,7 +35,6 @@
     def setUp(self):
         self.test_source_path = self._get_test_source_path()
         self.test_qml_file_path = self._get_test_qml_file_path()
-        self.desktop_file_path = self._get_desktop_file_path()
 
         if self.should_simulate_device():
             # Hide the Unity7 launcher because it takes space that might be
@@ -102,25 +101,6 @@
         return '/usr/lib/{}/qt5/examples//ubuntu-ui-toolkit/examples/' \
                'ubuntu-ui-toolkit-gallery'.format(host_multiarch)
 
-    def _get_desktop_file_path(self):
-        desktop_file_path = os.path.join(
-            self.test_source_path,
-            'ubuntu-ui-toolkit-gallery.desktop')
-        if self._application_source_exists():
-            local_desktop_file_dir = (
-                ubuntuuitoolkit.tests.get_local_desktop_file_directory())
-            if not os.path.exists(local_desktop_file_dir):
-                os.makedirs(local_desktop_file_dir)
-            local_desktop_file_path = os.path.join(
-                local_desktop_file_dir, 'ubuntu-ui-toolkit-gallery.desktop')
-            shutil.copy(desktop_file_path, local_desktop_file_path)
-            # We can't delete the desktop file before we close the application,
-            # so we save it on an attribute to be deleted on tear down.
-            self.local_desktop_file_path = local_desktop_file_path
-            return local_desktop_file_path
-        else:
-            return desktop_file_path
-
     def open_page(self, page):
         """Open a page of the widget gallery.
 
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2016-08-14 09:05:30 +0000
@@ -37,7 +37,8 @@
         self.assertEqual(
             collapsed_option_selector.get_selected_text(), 'Value 1')
 
-        collapsed_option_selector.select_option('Label', text='Value 4')
+        collapsed_option_selector.select_option(
+            'UCLabel', text='Once upon a time there was a story nobody told.')
         self.assertEqual(collapsed_option_selector.get_selected_index(), 3)
 
     def test_select_option_from_expanded_optionselector(self):
@@ -48,7 +49,8 @@
         self.assertEqual(
             expanded_option_selector.get_selected_text(), 'Value 1')
 
-        expanded_option_selector.select_option('Label', text='Value 4')
+        expanded_option_selector.select_option(
+            'UCLabel', text='Once upon a time there was a story nobody told.')
         self.assertEqual(expanded_option_selector.get_selected_index(), 3)
 
     def test_select_option_from_optionselector_with_custom_model(self):
@@ -61,6 +63,6 @@
             option_selector_with_custom_model.get_selected_index(), 0)
 
         option_selector_with_custom_model.select_option(
-            'Label', text='Name 4')
+            'UCLabel', text='Name 4')
         self.assertEqual(
             option_selector_with_custom_model.get_selected_index(), 3)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2016-08-14 09:05:30 +0000
@@ -37,6 +37,18 @@
         self.assertThat(textfield.text, Eventually(Equals("Yes")))
 
 
+class LauncherWindowTestCase(tests.QMLFileAppTestCase):
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_launcher.window.qml')
+
+    def test_window_root_item(self):
+        label = self.main_view.select_single(objectName="label")
+        self.assertThat(label.text,
+                        Eventually(Equals("Lorem ipsum dolor sit amet")))
+
+
 class LauncherQtTestTestCase(tests.QMLFileAppTestCase):
     path = os.path.abspath(__file__)
     dir_path = os.path.dirname(path)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml	2016-08-14 09:05:30 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 1.1
-import Ubuntu.Test 1.0
+import Ubuntu.Test 1.0 // UbuntuTestCase
 
 MainView {
     width: units.gu(48)
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Window 2.2 // Not Ubuntu.Test
+import Ubuntu.Components 1.3
+
+Window {
+    title: "Hello World"
+    minimumWidth: units.gu(30)
+    minimumHeight: units.gu(50)
+    maximumWidth: units.gu(90)
+    maximumHeight: units.gu(120)
+    MainView {
+        objectName: "mainView"
+
+        Page {
+            title: "Launcher/Window"
+
+            Column {
+                Label {
+                    objectName: "label"
+                    text: "Lorem ipsum dolor sit amet"
+                    width: units.gu(25)
+                    height: units.gu(25)
+                }
+            }
+        }
+    }
+}
 
=== removed file 'tests/unit/README'
--- tests/unit/README	2013-06-26 22:44:07 +0000
+++ tests/unit/README	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-== How to execute a single qml test ==
-
-When current path is tests/unit/tst_components:
-QML2_IMPORT_PATH=../../../modules:$QML2_IMPORT_PATH UBUNTU_UI_TOOLKIT_THEMES_PATH=../../../modules qmltestrunner -input tst_yourtest.qml -import "../../../modules"
 
=== added file 'tests/unit/bottomedge/ExternalContent.qml'
--- tests/unit/bottomedge/ExternalContent.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/bottomedge/ExternalContent.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    objectName: "external"
+    width: parent ? parent.width : 0
+    height: parent ? parent.height : 0
+    color: UbuntuColors.silk
+}
+
 
=== added file 'tests/unit/bottomedge/PreloadContentUrl.qml'
--- tests/unit/bottomedge/PreloadContentUrl.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/bottomedge/PreloadContentUrl.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        id: bottomEdge
+        height: parent.height
+        hint.text: "Test"
+        objectName: "testItem"
+        preloadContent: true
+        contentUrl: Qt.resolvedUrl("ExternalContent.qml")
+    }
+}
+
 
=== modified file 'tests/unit/bottomedge/bottomedge.pro'
--- tests/unit/bottomedge/bottomedge.pro	2016-05-31 09:02:35 +0000
+++ tests/unit/bottomedge/bottomedge.pro	2016-08-14 09:05:30 +0000
@@ -24,4 +24,6 @@
     UncoveredByRegion.qml \
     OverriddenHintTrigger.qml \
     PreloadedContent.qml \
-    BottomEdgeWithAction.qml
+    BottomEdgeWithAction.qml \
+    PreloadContentUrl.qml \
+    ExternalContent.qml
 
=== modified file 'tests/unit/bottomedge/tst_bottomedge.cpp'
--- tests/unit/bottomedge/tst_bottomedge.cpp	2016-07-25 23:24:46 +0000
+++ tests/unit/bottomedge/tst_bottomedge.cpp	2016-08-14 09:05:30 +0000
@@ -941,6 +941,16 @@
         QCOMPARE(regionObjects[i++], QString("default"));
     }
 
+    void test_preload_content_url()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadContentUrl.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        // commit so the contentItem is set
+        bottomEdge->commit();
+        QTRY_VERIFY(bottomEdge->contentItem());
+    }
+
     void test_reset_preload_content()
     {
         QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadedContent.qml"));
 
=== added file 'tests/unit/subtheming/GroupPropertyValueHints.qml'
--- tests/unit/subtheming/GroupPropertyValueHints.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/subtheming/GroupPropertyValueHints.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    HintedButton {
+        objectName: "Button"
+        id: button
+        gradient: UbuntuColors.greyGradient
+        StyleHints {
+            ignoreUnknownProperties: false
+            gradientProxy.topColor: "orange"
+        }
+    }
+}
 
=== added file 'tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml'
--- tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Button {
+        StyleHints {
+            ignoreUnknownProperties: false
+            gradientProxy.invalidProperty: 10
+        }
+    }
+}
 
=== modified file 'tests/unit/subtheming/subtheming.pro'
--- tests/unit/subtheming/subtheming.pro	2016-05-31 09:02:35 +0000
+++ tests/unit/subtheming/subtheming.pro	2016-08-14 09:05:30 +0000
@@ -37,9 +37,11 @@
     StyleHintsWithObject.qml \
     StyleHintsElsewhere.qml \
     StyleHintsInvalidProperty.qml \
+    StyleHintsInvalidGroupedProperty.qml \
     PropertyBindingHints.qml \
     MoreStyleHints.qml \
     GroupPropertyBindingHints.qml \
+    GroupPropertyValueHints.qml \
     OverrideStyleHints.qml \
     HintedButton.qml \
     OtherVersion.qml \
 
=== modified file 'tests/unit/subtheming/tst_subtheming.cpp'
--- tests/unit/subtheming/tst_subtheming.cpp	2016-07-25 23:24:46 +0000
+++ tests/unit/subtheming/tst_subtheming.cpp	2016-08-14 09:05:30 +0000
@@ -831,6 +831,9 @@
                 << "StyleHintsElsewhere.qml" << 24 << 5 << "QML StyleHints: StyleHints must be declared in a StyledItem or a derivate of it.";
         QTest::newRow("Invalid property")
                 << "StyleHintsInvalidProperty.qml" << 25 << 9 << "QML StyleHints: Style 'ButtonStyle' has no property called 'invalidProperty'.";
+        QTest::newRow("Invalid grouped property")
+                << "StyleHintsInvalidGroupedProperty.qml" << 25 << 9 << "QML StyleHints: Style 'ButtonStyle' has no property called 'gradientProxy.invalidProperty'.";
+
     }
     void test_stylehints_errors()
     {
@@ -881,8 +884,11 @@
 
         QTest::newRow("Same document")
                 << "MoreStyleHints.qml" << "defaultColor" << QColor("brown") << QColor("brown") << "minimumWidth" << units.gu(20);
-        QTest::newRow("Different document")
+        QTest::newRow("Different document, binding")
                 << "GroupPropertyBindingHints.qml" << "gradientProxy.topColor" << QColor("blue") << QColor("tan") << "minimumWidth" << units.gu(20);
+        // regression test for bug #1602836.
+        QTest::newRow("Different document, value")
+                << "GroupPropertyValueHints.qml" << "gradientProxy.topColor" << QColor("orange") << QColor("orange") << "minimumWidth" << units.gu(20);
     }
     void test_stylehints_multiple()
     {
 
=== modified file 'tests/unit/units/dpr1/tst_units.cpp'
--- tests/unit/units/dpr1/tst_units.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/units/dpr1/tst_units.cpp	2016-08-14 09:05:30 +0000
@@ -28,7 +28,7 @@
 private Q_SLOTS:
 
     void defaultGridUnit() {
-        qputenv("GRID_UNIT_PX", "");
+        qunsetenv("GRID_UNIT_PX");
         UCUnits units;
         QCOMPARE(units.gridUnit(), 8.0f);
     }
@@ -46,7 +46,7 @@
         qputenv("GRID_UNIT_PX", gridUnit);
         UCUnits units;
         QCOMPARE(units.gridUnit(), 11.0);
-        qputenv("GRID_UNIT_PX", "");
+        qunsetenv("GRID_UNIT_PX");
     }
 
     void dpGridUnitDefault() {
 
=== modified file 'tests/unit/units/dpr2/tst_units_dpr2.cpp'
--- tests/unit/units/dpr2/tst_units_dpr2.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/units/dpr2/tst_units_dpr2.cpp	2016-08-14 09:05:30 +0000
@@ -135,6 +135,8 @@
 int main(int argc, char *argv[])
 {
     qputenv("QT_DEVICE_PIXEL_RATIO", "2");
+    qputenv("QT_SCALE_FACTOR", "2");
+    qunsetenv("GRID_UNIT_PX");
 
     QGuiApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);
 
=== modified file 'tests/unit/units/dpr3/tst_units_dpr3.cpp'
--- tests/unit/units/dpr3/tst_units_dpr3.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/units/dpr3/tst_units_dpr3.cpp	2016-08-14 09:05:30 +0000
@@ -80,6 +80,8 @@
 int main(int argc, char *argv[])
 {
     qputenv("QT_DEVICE_PIXEL_RATIO", "3");
+    qputenv("QT_SCALE_FACTOR", "3");
+    qunsetenv("GRID_UNIT_PX");
 
     QGuiApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);
 
=== modified file 'tests/unit/visual/tst_actionbar.13.qml'
--- tests/unit/visual/tst_actionbar.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_actionbar.13.qml	2016-08-14 09:05:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,38 +15,71 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Test 1.0
 import Ubuntu.Components 1.3
 
 Item {
     id: root
-    width: 400
-    height: 600
+    width: units.gu(50)
+    height: units.gu(60)
 
     property list<Action> actionList:  [
         Action {
             iconName: "alarm-clock"
             text: "Tick tock"
+            onTriggered: print("tock")
         },
         Action {
             iconName: "appointment"
             text: "Date"
+            onTriggered: print("date")
         },
         Action {
             iconName: "attachment"
             text: "Attach"
+            onTriggered: print("attach")
         },
         Action {
             iconName: "contact"
             text: "Contact"
+            onTriggered: print("contact")
         },
         Action {
             iconName: "like"
             text: "Like"
+            onTriggered: print("+1")
         },
         Action {
             iconName: "lock"
             text: "Lock"
+            onTriggered: print("lock")
+        },
+        Action {
+            iconName: "camcorder"
+            text: "Camera"
+            onTriggered: print("cam")
+        },
+        Action {
+            iconName: "location"
+            text: "Location"
+            onTriggered: print("loc")
+            enabled: false
+        },
+        Action {
+            iconName: "message"
+            text: "Message"
+            onTriggered: print("msg")
+        },
+        Action {
+            iconName: "livetv"
+            text: "Television"
+            onTriggered: print("tv")
+        },
+        Action {
+            iconName: "lock-broken"
+            text: "Unlock"
+            onTriggered: print("unlock")
         }
     ]
 
@@ -54,10 +87,12 @@
         Action {
             iconName: "share"
             text: "Share"
+            onTriggered: print("share")
         },
         Action {
             iconName: "starred"
             text: "Favorite"
+            onTriggered: print("fav")
         }
     ]
 
@@ -70,13 +105,12 @@
         }
         height: childrenRect.height
 
-        Item {
+        RowLayout {
             width: parent.width
             height: childrenRect.height
 
             Label {
                 anchors {
-                    left: parent.left
                     verticalCenter: shortBar.verticalCenter
                 }
                 text: "" + shortBar.numberOfSlots + " slot(s):"
@@ -85,18 +119,17 @@
             ActionBar {
                 // no numberOfSlots specified. Using default value.
                 id: shortBar
-                anchors.right: parent.right
+                Layout.fillWidth: true
                 actions: root.shortActionList
             }
         }
 
-        Item {
+        RowLayout {
             width: parent.width
             height: childrenRect.height
 
             Label {
                 anchors {
-                    left: parent.left
                     verticalCenter: bar.verticalCenter
                 }
                 text: "" + bar.numberOfSlots + " slot(s):"
@@ -104,9 +137,36 @@
 
             ActionBar {
                 id: bar
-                anchors.right: parent.right
-                numberOfSlots: numberOfActionsSlider.value.toFixed(0)
-                actions: root.actionList
+                Layout.fillWidth: true
+                numberOfSlots: numberOfActionsSlider.value.toFixed(0)
+                actions: root.actionList
+            }
+        }
+
+        RowLayout {
+            width: parent.width
+            height: childrenRect.height
+            Label {
+                anchors {
+                    verticalCenter: coloredBar.verticalCenter
+                }
+                text: "colored:"
+            }
+            ActionBar {
+                id: coloredBar
+                Layout.fillWidth: true
+                numberOfSlots: numberOfActionsSlider.value.toFixed(0)
+                actions: root.actionList
+                StyleHints {
+                    ignoreUnknownProperties: false
+                    backgroundColor: UbuntuColors.blue
+                    buttons {
+                        foregroundColor: "white"
+                        disabledForegroundColor: UbuntuColors.silk
+                        pressedBackgroundColor: UbuntuColors.ash
+                        disabledBackgroundColor: UbuntuColors.slate
+                    }
+                }
             }
         }
 
@@ -122,20 +182,19 @@
             live: true
         }
 
-        Item {
+        RowLayout {
             width: parent.width
             height: childrenRect.height
 
             Label {
                 anchors {
-                    left: parent.left
                     verticalCenter: customDelegateBar.verticalCenter
                 }
                 text: "Custom delegate"
             }
             ActionBar {
                 id: customDelegateBar
-                anchors.right: parent.right
+                Layout.fillWidth: true
                 actions: root.shortActionList
                 delegate: Button {
                     action: modelData
@@ -146,23 +205,25 @@
             }
         }
 
-        Item {
+        RowLayout {
             width: parent.width
             height: childrenRect.height
             Label {
                 anchors {
-                    left: parent.left
                     verticalCenter: greenButtonsBar.verticalCenter
                 }
                 text: "Custom delegate 2"
             }
             ActionBar {
+                // Note: The same result (green buttons) can be accomplished
+                //  by setting the foregroundColor in the style.
                 id: greenButtonsBar
-                anchors.right: parent.right
+                Layout.fillWidth: true
                 actions: root.actionList
                 delegate: AbstractButton {
                     styleName: "IconButtonStyle"
                     action: modelData
+                    height: greenButtonsBar.height
                     StyleHints {
                         foregroundColor: UbuntuColors.green
                     }
 
=== added file 'tests/unit/visual/tst_adaptivepagelayout_param.13.qml'
--- tests/unit/visual/tst_adaptivepagelayout_param.13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/tst_adaptivepagelayout_param.13.qml	2016-08-14 09:05:30 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 1.3
+import Ubuntu.Components 1.3
+
+AdaptivePageLayout {
+    id: apl
+    width: units.gu(80)
+    height: units.gu(71)
+    asynchronous: false
+
+    primaryPage: Page {
+        header: PageHeader {
+            title: "Test"
+        }
+    }
+
+    Component {
+        id: testPage
+        Page {
+            objectName: "test_page"
+            header: PageHeader {
+                title: "NextPage"
+            }
+            property QtObject model : QtObject { objectName: "test" }
+        }
+    }
+
+    UbuntuTestCase {
+        when: windowShown
+
+        function findPageFromLayout(apl, objectName) {
+            var body = findChild(apl, "body");
+            verify(body);
+            return findChild(body, objectName);
+        }
+
+        function test_parameters_bug1604780() {
+            apl.addPageToCurrentColumn(apl.primaryPage, testPage, {model: null});
+            var page = findPageFromLayout(apl, "test_page");
+            verify(page);
+            compare(page.model, null);
+        }
+    }
+}
+
 
=== modified file 'tests/unit/visual/tst_combobutton.13.qml'
--- tests/unit/visual/tst_combobutton.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_combobutton.13.qml	2016-08-14 09:05:30 +0000
@@ -139,7 +139,7 @@
             rectCombo.expanded = true;
             waitForRendering(rectCombo);
             var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
         }
 
         function test_expandRectComboThroughClick() {
@@ -148,7 +148,7 @@
             waitForRendering(rectCombo);
             compare(rectCombo.expanded, true, "combo is not expanded");
             var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
         }
 
         function test_autoCollapse() {
@@ -157,12 +157,12 @@
             mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
             waitForRendering(rectCombo);
             compare(rectCombo.expanded, true, "combo is not expanded");
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
 
             mouseClick(rectCombo, rectCombo.width / 2, rectCombo.collapsedHeight / 2);
             waitForRendering(rectCombo);
             compare(rectCombo.expanded, false, "combo is not collapsed");
-            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, false);
         }
 
         function test_flickRectCombo() {
@@ -174,7 +174,7 @@
             var comboList = findChild(rectCombo, "combobutton_combolist");
             mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
             waitForRendering(rectCombo);
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
             verify(comboList.height > rectCombo.expandedHeight);
             // comboList flicker is the combolist parent's parent
             var comboListFlicker = findChild(rectCombo, "combobutton_contentflicker");
@@ -196,10 +196,11 @@
             var comboList = findChild(columnCombo, "combobutton_combolist");
             columnCombo.expanded = true;
             waitForRendering(columnCombo);
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
             var comboListFlicker = findChild(columnCombo, "combobutton_contentflicker");
+            waitForRendering(comboListFlicker);
             compare(comboListFlicker.interactive, false, "combo list holder must not be interactive");
-            compare(comboListFlicker.height, columnCombo.comboListHeight, "combo list height differs from the holder height");
+            tryCompare(comboListFlicker, 'height', columnCombo.comboListHeight, 500, "combo list height differs from the holder height");
         }
 
         function test_emptyComboExpanded() {
@@ -208,7 +209,7 @@
             combo.expanded = true;
             waitForRendering(combo);
             waitForRendering(comboListPanel);
-            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0, 1000);
+            tryCompareFunction(function() { return comboListPanel.visible}, false, 1000);
         }
 
         function test_longCombo() {
@@ -217,7 +218,7 @@
             longCombo.expanded = true;
             waitForRendering(longCombo);
             waitForRendering(comboListPanel);
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
             verify(comboListPanel.height < longCombo.expandedHeight);
         }
 
@@ -227,9 +228,21 @@
             listCombo.expanded = true;
             waitForRendering(listCombo);
             waitForRendering(comboListPanel);
-            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            tryCompareFunction(function() { return comboListPanel.visible}, true);
 
             compare(list.height, comboList.height, "list and comboList height differs");
         }
+
+        function test_expand_via_keyboard() {
+            rectCombo.forceActiveFocus();
+            waitForRendering(rectCombo);
+            tryCompare(rectCombo, 'expanded', false, 500, "ComboBox not expanded after focus");
+            keyClick(Qt.Key_Space);
+            waitForRendering(rectCombo);
+            verify(rectCombo.expanded, true, "ComboBox was expanded via the Space key");
+            keyClick(Qt.Key_Space);
+            waitForRendering(rectCombo);
+            tryCompare(rectCombo, 'expanded', false, 500, "ComboBox was collapsed via the Space key");
+        }
     }
 }
 
=== modified file 'tests/unit/visual/tst_focus.13.qml'
--- tests/unit/visual/tst_focus.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_focus.13.qml	2016-08-14 09:05:30 +0000
@@ -279,6 +279,8 @@
                 {tag: "ActionBar", from: 'actionBarShare_button', to: picker, key: Qt.Key_Tab},
                 {tag: "ActionBar(back)", from: picker, to: 'actionBarShare_button', key: Qt.Key_Backtab},
                 */
+                {tag: "ComboButton", from: pickerPanel, to: comboButton, key: Qt.Key_Tab},
+                {tag: "ComboButton(back)", from: comboButton, to: pickerPanel, key: Qt.Key_Backtab},
                 // Left click/ tap
                 {tag: "TextField(click)", from: dummy, to: textField, key: Qt.LeftButton},
                 {tag: "TextArea(click)", from: dummy, to: textArea, key: Qt.LeftButton},
@@ -370,10 +372,11 @@
 
             var center = centerOf(dropdownButton);
             mouseClick(dropdownButton, center.x, center.y);
+            waitForRendering(dropdownButton);
             waitForRendering(comboButton);
             // FIXME: lp#1368390: Buttons shouldn't grab input focus on click
-            compare(dropdownButton.focus, true, "Dropdown button hasn't got focused!");
-            compare(comboButton.focus, true, "ComboButton hasn't been focused!");
+            compare(dropdownButton.activeFocus, false, "Dropdown button hasn't got focused!");
+            compare(comboButton.activeFocus, true, "ComboButton hasn't been focused!");
             comboButton.expanded = false;
             waitForRendering(comboButton);
         }
@@ -448,6 +451,9 @@
                 {tag: "ListItem/Enter", key: Qt.Key_Enter, item: listItem, signalName: 'onClicked'},
                 {tag: "ListItem/Return", key: Qt.Key_Return, item: listItem, signalName: 'onClicked'},
                 {tag: "ListItem/Space", key: Qt.Key_Space, item: listItem, signalName: 'onClicked'},
+                {tag: "ComboButton/Enter", key: Qt.Key_Enter, item: button , signalName: 'onTriggered'},
+                {tag: "ComboButton/Return", key: Qt.Key_Return, item: button, signalName: 'onTriggered'},
+                {tag: "ComboButton/Space", key: Qt.Key_Space, item: button, signalName: 'onTriggered'},
             ];
         }
         function test_trigger_via_keyboard(data) {
 
=== modified file 'tests/unit/visual/tst_listitem.12.qml'
--- tests/unit/visual/tst_listitem.12.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_listitem.12.qml	2016-08-14 09:05:30 +0000
@@ -245,7 +245,7 @@
 
         function test_0_defaults() {
             verify(defaults.contentItem !== null, "Defaults is null");
-            compare(defaults.color, "#000000", "Transparent by default");
+            compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default");
             compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default")
             compare(defaults.highlighted, false, "Not highlighted by default");
             compare(defaults.divider.visible, true, "divider is visible by default");
 
=== modified file 'tests/unit/visual/tst_listitem.13.qml'
--- tests/unit/visual/tst_listitem.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_listitem.13.qml	2016-08-14 09:05:30 +0000
@@ -245,7 +245,7 @@
 
         function test_0_defaults() {
             verify(defaults.contentItem !== null, "Defaults is null");
-            compare(defaults.color, "#000000", "Transparent by default");
+            compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default");
             compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default")
             compare(defaults.highlighted, false, "Not highlighted by default");
             compare(defaults.divider.visible, true, "divider is visible by default");
 
=== modified file 'tests/unit/visual/tst_listitem_focus.13.qml'
--- tests/unit/visual/tst_listitem_focus.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_listitem_focus.13.qml	2016-08-14 09:05:30 +0000
@@ -27,27 +27,125 @@
 
     property Item activeFocusItem: Window.activeFocusItem
 
+    PageHeader {
+        id: header
+        title: "ListItem focus test"
+        extension: Sections {
+            id: directionSections
+            width: parent.width
+            selectedIndex: -1
+            function setupListView(showContent, orientation, reverseDirection) {
+                testCase.cleanup();
+                var test = testCase.loadTest(listView);
+                test.orientation = orientation;
+                if (reverseDirection) {
+                    if (orientation === ListView.Horizontal) {
+                        test.layoutDirection = Qt.RightToLeft;
+                    } else {
+                        test.verticalLayoutDirection = ListView.BottomToTop;
+                    }
+                }
+                if (showContent) {
+                    test.delegate = listItemWithContent;
+                } else {
+                    test.delegate = simpleListItem;
+                }
+            }
+
+            actions: [
+                Action {
+                    text: "TopToBottom"
+                    onTriggered: directionSections.setupListView(switchContentAction.showContent,
+                                                                 ListView.Vertical, false);
+                },
+                Action {
+                    text: "LeftToRight"
+                    onTriggered: directionSections.setupListView(switchContentAction.showContent,
+                                                                 ListView.Horizontal, false);
+                },
+                Action {
+                    text: "BottomToTop"
+                    onTriggered: directionSections.setupListView(switchContentAction.showContent,
+                                                                 ListView.Vertical, true);
+                },
+                Action {
+                    text: "RightToLeft"
+                    onTriggered: directionSections.setupListView(switchContentAction.showContent,
+                                                                 ListView.Horizontal, true);
+                }
+
+            ]
+        }
+        trailingActionBar.actions: [
+            Action {
+                id: switchContentAction
+                property bool showContent: false
+                iconName: showContent ? "select" : "select-none"
+                onTriggered: {
+                    showContent = !showContent;
+                    if (directionSections.selectedIndex >= 0) {
+                        directionSections.actions[directionSections.selectedIndex].trigger();
+                    }
+                }
+            }
+        ]
+    }
+
     Rectangle {
-        id: topItem
-        objectName: "topItem"
+        id: topFocusItem
+        objectName: "topFocusItem"
         activeFocusOnTab: true
-        width: parent.width
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: header.bottom
+        }
         height: units.gu(2)
+        border {
+            width: units.dp(3)
+            color: topFocusItem.activeFocus ? UbuntuColors.orange : UbuntuColors.silk
+        }
     }
-
     Loader {
         id: testLoader
         anchors {
-            fill: parent
-            topMargin: topItem.height
+            left: parent.left
+            right: parent.right
+            top: topFocusItem.bottom
+            bottom: bottomFocusItem.top
+        }
+        clip: true
+    }
+    Rectangle {
+        id: bottomFocusItem
+        objectName: "bottomFocusItem"
+        activeFocusOnTab: true
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(2)
+        border {
+            width: units.dp(3)
+            color: bottomFocusItem.activeFocus ? UbuntuColors.orange : UbuntuColors.silk
         }
     }
 
     Component {
         id: simpleListItem
         ListItem {
+            id: listItem
             objectName: "simple" + index
             property int itemIndex: index
+            Label {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                text: listItem.objectName
+            }
         }
     }
 
@@ -61,7 +159,7 @@
                 spacing: units.gu(1)
                 CheckBox { objectName: "checkbox" + listItem.itemIndex }
                 Switch { objectName: "switch" + listItem.itemIndex }
-                Button { objectName: "button" + listItem.itemIndex; text: "test" }
+                Button { objectName: "button" + listItem.itemIndex; text: "test " + itemIndex }
             }
             leadingActions: ListItemActions {
                 actions: Action {
@@ -100,6 +198,7 @@
     }
 
     ListItemTestCase13 {
+        id: testCase
         name: "ListItemFocus"
         when: windowShown
 
@@ -114,7 +213,7 @@
             wait(200);
         }
         function init() {
-            topItem.forceActiveFocus(Qt.TabFocusReason);
+            topFocusItem.forceActiveFocus(Qt.TabFocusReason);
         }
 
         function initTestCase() {
@@ -124,10 +223,10 @@
         // Tab/Backtab focuses the First ListItem in a ListView
         function test_focusing_listview_focuses_first_item_data() {
             return [
-                {tag: "Tab, no content", preFocus: topItem, delegate: simpleListItem, key: Qt.Key_Tab, focusItem: "simple0"},
-                {tag: "Tab, with content", preFocus: topItem, delegate: listItemWithContent, key: Qt.Key_Tab, focusItem: "withContent0"},
-                {tag: "Backtab, no content", preFocus: topItem, delegate: simpleListItem, key: Qt.Key_Backtab, focusItem: "simple0"},
-                {tag: "Backtab, with content", preFocus: topItem, delegate: listItemWithContent, key: Qt.Key_Backtab, focusItem: "withContent0"},
+                {tag: "Tab, no content", preFocus: topFocusItem, delegate: simpleListItem, key: Qt.Key_Tab, focusItem: "simple0"},
+                {tag: "Tab, with content", preFocus: topFocusItem, delegate: listItemWithContent, key: Qt.Key_Tab, focusItem: "withContent0"},
+                {tag: "Backtab, no content", preFocus: bottomFocusItem, delegate: simpleListItem, key: Qt.Key_Backtab, focusItem: "simple0"},
+                {tag: "Backtab, with content", preFocus: bottomFocusItem, delegate: listItemWithContent, key: Qt.Key_Backtab, focusItem: "withContent0"},
             ];
         }
         function test_focusing_listview_focuses_first_item(data) {
@@ -155,6 +254,15 @@
                             keyTimes: 3,
                             focusItems: ["simple1", "simple2", "simple3"]
                         },
+                        {   tag: "BottomToTop up, no content, bottom to top direction, from beginning",
+                            delegate: simpleListItem,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: 0,
+                            key: Qt.Key_Up,
+                            keyTimes: 3,
+                            focusItems: ["simple1", "simple2", "simple3"]
+                        },
                         {
                             tag: "Down, no contents, near end",
                             delegate: simpleListItem,
@@ -165,6 +273,17 @@
                             // Don't navigate beyond the last item:
                             focusItems: ["simple"+(n-2), "simple"+(n-1), "simple"+(n-1)]
                         },
+                        {
+                            tag: "BottomToTop up, no contents, near end",
+                            delegate: simpleListItem,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: n - 3,
+                            key: Qt.Key_Up,
+                            keyTimes: 3,
+                            // Don't navigate beyond the last item:
+                            focusItems: ["simple"+(n-2), "simple"+(n-1), "simple"+(n-1)]
+                        },
                         {   tag: "Up, no content, near beginning",
                             delegate: simpleListItem,
                             orientation: ListView.Vertical,
@@ -173,6 +292,15 @@
                             keyTimes: 3,
                             focusItems: ["simple1", "simple0", "simple0"]
                         },
+                        {   tag: "BottomToTop down, no content, near beginning",
+                            delegate: simpleListItem,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: 2,
+                            key: Qt.Key_Down,
+                            keyTimes: 3,
+                            focusItems: ["simple1", "simple0", "simple0"]
+                        },
                         {
                             tag: "Up, no contents, from end",
                             delegate: simpleListItem,
@@ -182,6 +310,16 @@
                             keyTimes: 3,
                             focusItems: ["simple"+(n-2), "simple"+(n-3), "simple"+(n-4)]
                         },
+                        {
+                            tag: "BottomToTop down, no contents, from end",
+                            delegate: simpleListItem,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: n - 1,
+                            key: Qt.Key_Down,
+                            keyTimes: 3,
+                            focusItems: ["simple"+(n-2), "simple"+(n-3), "simple"+(n-4)]
+                        },
                         {   tag: "Left, no content, near beginning",
                             delegate: simpleListItem,
                             orientation: ListView.Horizontal,
@@ -190,6 +328,15 @@
                             keyTimes: 3,
                             focusItems: ["simple1", "simple0", "simple0"]
                         },
+                        {   tag: "RightToLeft right, no content, near beginning",
+                            delegate: simpleListItem,
+                            orientation: ListView.Horizontal,
+                            direction: Qt.RightToLeft,
+                            initialIndex: 2,
+                            key: Qt.Key_Right,
+                            keyTimes: 3,
+                            focusItems: ["simple1", "simple0", "simple0"]
+                        },
                         {   tag: "Left, no content, from end",
                             delegate: simpleListItem,
                             orientation: ListView.Horizontal,
@@ -198,6 +345,15 @@
                             keyTimes: 3,
                             focusItems: ["simple"+(n-2), "simple"+(n-3), "simple"+(n-4)]
                         },
+                        {   tag: "RightToLeft right, no content, from end",
+                            delegate: simpleListItem,
+                            orientation: ListView.Horizontal,
+                            direction: Qt.RightToLeft,
+                            initialIndex: n - 1,
+                            key: Qt.Key_Right,
+                            keyTimes: 3,
+                            focusItems: ["simple"+(n-2), "simple"+(n-3), "simple"+(n-4)]
+                        },
                         {   tag: "Right, no content, from beginning",
                             delegate: simpleListItem,
                             orientation: ListView.Horizontal,
@@ -206,6 +362,15 @@
                             keyTimes: 5,
                             focusItems: ["simple1", "simple2", "simple3", "simple4", "simple5"]
                         },
+                        {   tag: "RightToLeft left, no content, from beginning",
+                            delegate: simpleListItem,
+                            orientation: ListView.Horizontal,
+                            direction: Qt.RightToLeft,
+                            initialIndex: 0,
+                            key: Qt.Key_Left,
+                            keyTimes: 5,
+                            focusItems: ["simple1", "simple2", "simple3", "simple4", "simple5"]
+                        },
                         {   tag: "Right, no content, near end",
                             delegate: simpleListItem,
                             orientation: ListView.Horizontal,
@@ -214,6 +379,15 @@
                             keyTimes: 2,
                             focusItems: ["simple"+(n-2), "simple"+(n-1), "simple"+(n-1)]
                         },
+                        {   tag: "RightToLeft left, no content, near end",
+                            delegate: simpleListItem,
+                            orientation: ListView.Horizontal,
+                            direction: Qt.RightToLeft,
+                            initialIndex: n - 3,
+                            key: Qt.Key_Left,
+                            keyTimes: 2,
+                            focusItems: ["simple"+(n-2), "simple"+(n-1), "simple"+(n-1)]
+                        },
                         {   tag: "Down, with content, from beginning",
                             delegate: listItemWithContent,
                             orientation: ListView.Vertical,
@@ -222,6 +396,15 @@
                             keyTimes: 3,
                             focusItems: ["withContent1", "withContent2", "withContent3"]
                         },
+                        {   tag: "BottomToTop up, with content, from beginning",
+                            delegate: listItemWithContent,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: 0,
+                            key: Qt.Key_Up,
+                            keyTimes: 3,
+                            focusItems: ["withContent1", "withContent2", "withContent3"]
+                        },
                         {   tag: "Down, with content, near end",
                             delegate: listItemWithContent,
                             orientation: ListView.Vertical,
@@ -230,6 +413,15 @@
                             keyTimes: 3,
                             focusItems: ["withContent"+(n-2), "withContent"+(n-1), "withContent"+(n-1)]
                         },
+                        {   tag: "BottomToTop up, with content, near end",
+                            delegate: listItemWithContent,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: n - 3,
+                            key: Qt.Key_Up,
+                            keyTimes: 3,
+                            focusItems: ["withContent"+(n-2), "withContent"+(n-1), "withContent"+(n-1)]
+                        },
                         {   tag: "Up, with content, near beginning",
                             delegate: listItemWithContent,
                             orientation: ListView.Vertical,
@@ -238,6 +430,15 @@
                             keyTimes: 3,
                             focusItems: ["withContent1", "withContent0", "withContent0"]
                         },
+                        {   tag: "BottomToTop down, with content, near beginning",
+                            delegate: listItemWithContent,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: 2,
+                            key: Qt.Key_Down,
+                            keyTimes: 3,
+                            focusItems: ["withContent1", "withContent0", "withContent0"]
+                        },
                         {   tag: "Up, with content, from end",
                             delegate: listItemWithContent,
                             orientation: ListView.Vertical,
@@ -245,6 +446,15 @@
                             key: Qt.Key_Up,
                             keyTimes: 2,
                             focusItems: ["withContent"+(n-2), "withContent"+(n-3)]
+                        },
+                        {   tag: "BottomToTop down, with content, from end",
+                            delegate: listItemWithContent,
+                            orientation: ListView.Vertical,
+                            direction: ListView.BottomToTop,
+                            initialIndex: n - 1,
+                            key: Qt.Key_Down,