Merge lp:~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer into lp:ubuntu-ui-toolkit

[Tim Peeters]

Add new tab patterns (and autopilot tests for those patterns) which are used when useDeprecatedToolbar in MainView is false. The old tab patterns (and test) also still work.

[Leo Arias (elopio)]

42 + // FIXME: Currently autopilot can only get visual items, but once it is
43 + // updated to support non-visual items, a QtObject may be used.

Please add a link to http://pad.lv/1273956 so we know what you are referring to. Also, I find it useful to sign the FIXME comments, with something like --timp - 2014-03-19

637 + current_tab = tabs.get_current_tab()
638 + number_of_switches = 0
639 + while not tabs.selectedTabIndex == index:
640 + logger.debug(
641 + 'Current tab index: {0}.'.format(tabs.selectedTabIndex))
642 + if number_of_switches >= number_of_tabs - 1:
643 + # This prevents a loop. But if this error is ever raised, it's
644 + # likely there's a bug on the emulator or on the QML Tab.
645 + raise ToolkitEmulatorException(
646 + 'The tab with index {0} was not selected.'.format(index))
647 + current_tab = self.switch_to_next_tab()
648 + number_of_switches += 1
649 + return current_tab

You should move this into a method. You can call it something like _switch_to_deprecated_tab_by_index

651 + if (index != tabs.selectedTabIndex):
652 + self.get_header().switch_to_tab_by_index(index)
653 + current_tab = tabs.get_current_tab()
654 + return current_tab

This is not a big deal, but it would also make it clearer putting those statements on _switch_to_tab_in_drawer_by_index

668 + return false

Typo. It's False.

677 + try:
678 + tab_bar = self.select_single(TabBar)
679 + except dbus.StateNotFoundError:
680 + raise ToolkitEmulatorException(_NO_TABS_ERROR)
681 + tab_bar.switch_to_next_tab()
682 + self._get_animating().wait_for(False)

Same thing here ^

684 + try:
685 + tabs_drawer_button = self.select_single('AbstractButton', objectName='tabsButton')
686 + except dbus.StateNotFoundError:
687 + raise ToolkitEmulatorException(_NO_TABS_ERROR)
688 + self.pointing_device.click_object(tabs_drawer_button)
689 +
690 + tabs_model_properties = self.select_single('QQuickItem', objectName='tabsModelProperties')
691 + next_tab_index = (tabs_model_properties.selectedIndex + 1) % tabs_model_properties.count
692 +
693 + try:
694 + tab_button = self.get_root_instance().select_single('Standard',
695 + objectName='tabButton'+str(next_tab_index))
696 + except dbus.StateNotFoundError:
697 + raise ToolkitEmulatorException("Tab button {0} not found.".format(next_tab_index))
698 +
699 + self.pointing_device.click_object(tab_button)

and here ^. Please wrap them in something like _switch_to_next_deprecated_tab, and _switch_to_next_tab_in_drawer

4 + try:
685 + tabs_drawer_button = self.select_single('AbstractButton', objectName='tabsButton')
686 + except dbus.StateNotFoundError:
687 + raise ToolkitEmulatorException(_NO_TABS_ERROR)

You can also move this ^

724 + try:
725 + tab_button = self.get_root_instance().select_single('Standard',
726 + objectName='tabButton'+str(index))
727 + except dbus.StateNotFoundError:
728 + raise ToolkitEmulatorException("Tab button {0} not found.".format(index))

and this ^ into a private methods, as you have the same statements twice.

755 +class DeprecatedTabsTestCase(TabsTestCase):

I would prefer to do it with scenarios. Take a look at http://paste.ubuntu.com/7121301/
I haven't tried it, but something like that should work.

70...

review: Needs Fixing (code review of the autopilot tests and helpers)

[Leo Arias (elopio)]

review: Approve (code review of the autopilot tests and helpers)

[lp:~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer]

964. By Tim Peeters on 2014-03-24

merge trunk

965. By Tim Peeters on 2014-03-24

revert

966. By Tim Peeters on 2014-03-24

merge optIn-newHeader

967. By Tim Peeters on 2014-03-24

link bug

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:963
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1938/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3779/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/886/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/886/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4265/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3781/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1938/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1943/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3787/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/891/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/891/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4273/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3789/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1943/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer]

968. By Tim Peeters on 2014-04-02

remove unused variable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:968
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1983/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4481/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4081/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/931/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/931/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4588/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4116/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1983/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer]

969. By Tim Peeters on 2014-04-08

bug no longer present in this branch

970. By Tim Peeters on 2014-04-08

merge 20-tabbarInStyle

971. By Tim Peeters on 2014-04-08

merge 25-pageTitle

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:971
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2004/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/952/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/952/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4725/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2004/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer]

972. By Tim Peeters on 2014-04-09

fix TypeError when closing StackWithTabs example

973. By Tim Peeters on 2014-04-09

update StackWithTabs example

974. By Tim Peeters on 2014-04-09

update Tabs example

975. By Tim Peeters on 2014-04-09

merge tabbarInStyle

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:974
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2019/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4714/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/967/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/967/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4842/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2019/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:975
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2020/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4716/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/968/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/968/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4845/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2020/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

replaced by this MR: https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/30-optIn-tabsDrawer/+merge/216960

review: Disapprove

Unmerged revisions

975. By Tim Peeters on 2014-04-09

merge tabbarInStyle

974. By Tim Peeters on 2014-04-09

update Tabs example

973. By Tim Peeters on 2014-04-09

update StackWithTabs example

972. By Tim Peeters on 2014-04-09

fix TypeError when closing StackWithTabs example

971. By Tim Peeters on 2014-04-08

merge 25-pageTitle

970. By Tim Peeters on 2014-04-08

merge 20-tabbarInStyle

969. By Tim Peeters on 2014-04-08

bug no longer present in this branch

968. By Tim Peeters on 2014-04-02

remove unused variable

967. By Tim Peeters on 2014-03-24

link bug

966. By Tim Peeters on 2014-03-24

merge optIn-newHeader

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-08 14:47:06 +0000
+++ debian/changelog	2014-04-09 21:55:48 +0000
@@ -78,27 +78,6 @@
 
  -- Ubuntu daily release <[e-mail]>  Mon, 31 Mar 2014 18:26:59 +0000
 
-ubuntu-ui-toolkit (0.1.46+14.04.20140321.1-0ubuntu1) trusty; urgency=low
-
-  [ Bartosz Kosiorek ]
-  * Fix selection and coping text from TextFields (LP: 1130369) (LP:
-    #1130369)
-  * "Cut" operation do not shows for "ReadOnly's" TextField and TextArea
-    (LP: 1293149) (LP: #1293149, #1267821)
-
-  [ Zsombor Egri ]
-  * InverseMouseArea not getting mouse events converted from touch when
-    set as topmost item. (LP: #1288876)
-
-  [ Michael Zanetti ]
-  * drop BottomBarVisiblityCommunicator as it has gone from unity8 - no
-    more HUD from the lower edge
-
-  [ Christian Dywan ]
-  * Introduce UbuntuTestCase API for C++ (LP: #1261396)
-
- -- Ubuntu daily release <[e-mail]>  Fri, 21 Mar 2014 11:29:53 +0000
-
 ubuntu-ui-toolkit (0.1.46+14.04.20140317-0ubuntu1) trusty; urgency=low
 
   [ Didier Roche ]

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-04-09 21:55:47 +0000
+++ modules/Ubuntu/Components/Header.qml	2014-04-09 21:55:48 +0000
@@ -97,6 +97,23 @@
     property var tabsModel: null
 
     /*!
+      A model of tabs to represent in the header.
+      This is automatically set by \l Tabs.
+     */
+    property var tabsModel: null
+
+    // FIXME: Currently autopilot can only get visual items, but once bug #1273956
+    //  is fixed to support non-visual items, a QtObject may be used.
+    //  --timp - 2014-03-20
+    Item {
+        // FIXME: This is a workaround to be able to get the properties of
+        //  tabsModel in an autopilot test.
+        objectName: "tabsModelProperties"
+        property int count: tabsModel ? tabsModel.count : 0
+        property int selectedIndex: tabsModel ? tabsModel.selectedIndex : -1
+    }
+
+    /*!
       The flickable that controls the movement of the header.
       Will be set automatically by Pages inside a MainView, but can
       be overridden.
@@ -108,6 +125,11 @@
         header.show();
     }
 
+    /*!
+      Set by \l MainView
+     */
+    property bool useDeprecatedToolbar: true
+
     QtObject {
         id: internal
 
@@ -195,5 +217,6 @@
         }
     }
 
-    style: Theme.createStyleComponent("HeaderStyle.qml", header)
+    style: header.useDeprecatedToolbar ? Theme.createStyleComponent("HeaderStyle.qml", header) :
+                                         Theme.createStyleComponent("NewHeaderStyle.qml", header)
 }

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2014-04-04 11:03:45 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-04-09 21:55:48 +0000
@@ -369,6 +369,8 @@
                 }
             }
 
+            useDeprecatedToolbar: mainView.useDeprecatedToolbar
+
             // 'window' is defined by QML between startup and showing on the screen.
             // There is no signal for when it becomes available and re-declaring it is not safe.
             property bool windowActive: typeof window != 'undefined'
@@ -451,6 +453,12 @@
 
         /*!
           \internal
+          Tabs needs to know whether to use a TabBar or the new header.
+         */
+        property alias useDeprecatedToolbar: mainView.useDeprecatedToolbar
+
+        /*!
+          \internal
           The action manager that has the global context for the MainView's actions,
           and to which a local context can be added for each Page that has actions.actions.
          */

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-04-02 09:47:42 +0000
+++ modules/Ubuntu/Components/Panel.qml	2014-04-09 21:55:48 +0000
@@ -407,6 +407,11 @@
         property string previousState: ""
         property int movingDelta
 
+        // Used for recovering the state from before
+        //  bottomBarVisibilityCommunicator forced the toolbar to hide.
+        property bool savedLocked: panel.locked
+        property bool savedOpened: panel.opened
+
         // Convert from Qt.AlignLeading to Qt.AlignTrailing to Qt.AlignLeft and Qt.AlignRight
         property int align: {
             if (panel.align === Qt.AlignLeading) {
@@ -430,6 +435,30 @@
                                            ? Qt.Horizontal : Qt.Vertical
     }
 
+    Connections {
+        // FIXME: bottomBarVisibilityCommunicator is not the most-suitable name anymore.
+        target: bottomBarVisibilityCommunicator
+        onForceHiddenChanged: {
+            if (bottomBarVisibilityCommunicator.forceHidden) {
+                internal.savedLocked = panel.locked;
+                internal.savedOpened = panel.opened;
+                panel.close();
+                panel.locked = true;
+            } else { // don't force hidden
+                panel.locked = internal.savedLocked;
+                if (panel.locked) {
+                    if (internal.savedOpened) {
+                        panel.open();
+                    } else {
+                        panel.close();
+                    }
+                }
+                // if the panel was locked, do not slide it back in
+                // until the user performs an edge swipe.
+            }
+        }
+    }
+
     /*! \internal */
     onStateChanged: {
         if (state == "hint") {
@@ -637,6 +666,8 @@
         //position will always be in the range 0..size, where position==0 means spread, position==size means hidden.
         property real position: panel.opened ? 0 : size
 
+        onPositionChanged: bottomBarVisibilityCommunicator.position = size - position
+
         y: internal.align === Qt.AlignTop ? -position : internal.align === Qt.AlignBottom ? position : 0
         x: internal.align === Qt.AlignLeft ? -position : internal.align === Qt.AlignRight ? position : 0
     }

=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2014-04-09 21:55:48 +0000
@@ -63,8 +63,18 @@
 
     /*!
       The property holds the index of the selected Tab item.
+      Note: Setting this property is DEPRECATED. Set the selectedIndex of the model instead.
       */
-    property int selectedIndex: (model && internal.modelChecked && model.count > 0) ? 0 : -1
+    property int selectedIndex: (model && internal.modelChecked) ? model.selectedIndex : -1
+
+    /*! \internal */
+    onSelectedIndexChanged: {
+        if (!model) return;
+        if (tabBar.selectedIndex !== model.selectedIndex) {
+            console.warn("Setting TabBar.selectedIndex is DEPRECATED. Set selectedIndex of the model instead");
+            tabBar.selectedIndex = Qt.binding(function() { return (model && internal.modelChecked) ? model.selectedIndex : -1 });
+        }
+    }
 
     /*!
       Do not deactivate the tab bar after a specified idle time or when the user selects a new tab.
@@ -95,18 +105,21 @@
 
         function checkRoles() {
             if (tabBar.model.count <= 0)
-                return;
+                return false;
 
             modelChecked = true;
             var f = tabBar.model.get(0);
             if (f.tab === undefined && f.title === undefined) {
                 console.error("TabBar model must provide either tab or title role.");
                 tabBar.model = null;
+                return false;
             }
             if (f.tab !== undefined && f.tab.title === undefined) {
                 console.error("TabBar model's tab role must have title property.");
                 tabBar.model = null;
+                return false;
             }
+            return true;
         }
     }
 
@@ -117,6 +130,12 @@
         if (!model)
             return;
 
+        if (!model.hasOwnProperty("selectedIndex")) {
+            console.error("TabBar model must have selectedIndex property defined.");
+            tabBar.model = null;
+            return;
+        }
+
         if (!model.hasOwnProperty("count")) {
             console.error("TabBar model must have count property defined.");
             tabBar.model = null;
@@ -130,11 +149,11 @@
         }
 
         if (model.count > 0) {
-            internal.checkRoles();
-            tabBar.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
+            if (internal.checkRoles()) {
+                model.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
+            }
         } else {
             internal.modelChecked = false;
-            tabBar.selectedIndex = Qt.binding(function() { return (model && internal.modelChecked && model.count > 0) ? 0 : -1 })
         }
     }
 

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-04-09 21:55:47 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-09 21:55:48 +0000
@@ -161,7 +161,7 @@
       The first tab is 0, and -1 means that no tab is selected.
       The initial value is 0 if Tabs has contents, or -1 otherwise.
      */
-    property alias selectedTabIndex: bar.selectedIndex
+    property alias selectedTabIndex: tabsModel.selectedIndex
 
     /*!
       \preliminary
@@ -209,6 +209,11 @@
     ListModel {
         id: tabsModel
 
+        /*!
+          The index of the selected tab.
+         */
+        property int selectedIndex: tabsModel.count > 0 ? 0 : -1
+
         function listModel(tab) {
             return {"title": tab.title, "tab": tab};
         }

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-03-17 17:58:47 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-04-09 21:55:48 +0000
@@ -834,6 +834,8 @@
         property real lineSize: editor.font.pixelSize + lineSpacing
         //selection properties
         property bool selectionMode: false
+        property int selectionStart: 0
+        property int selectionEnd: 0
 
         signal popupTriggered()
 
@@ -880,20 +882,16 @@
         // reset selection
         function resetEditorSelection(mouseX)
         {
-            editor.cursorPosition = editor.positionAt(mouseX);
+            editor.cursorPosition = selectionStart = selectionEnd = editor.positionAt(mouseX);
         }
 
         // positions the cursor depending on whether there is a selection active or not
         function positionCursor(x) {
-
             var cursorPos = control.positionAt(x);
-            if (control.selectedText === "") {
-                control.cursorPosition = cursorPos;
-            }
-            // If target cursor position is outside selection then cancel selection and move cursor
-            else if (control.selectionStart > cursorPos || control.selectionEnd < cursorPos) {
-                control.cursorPosition = cursorPos;
-            }
+            if (internal.selectionEnd == internal.selectionStart)
+                control.cursorPosition = control.positionAt(x);
+            else
+                control.select(internal.selectionStart, internal.selectionEnd);
         }
     }
 
@@ -1057,6 +1055,9 @@
                 if (!control.activeFocus)
                     return;
                 editor.selectWord();
+                // update selection boundaries, except cursorPosition
+                internal.selectionEnd = editor.selectionEnd;
+                internal.selectionStart = editor.selectionStart;
                 internal.selectionMode = false;
             }
             onPressed: {
@@ -1064,7 +1065,7 @@
                 if (!control.activeFocus || (pressedButtons != Qt.LeftButton))
                     return;
                 internal.activateEditor();
-                if (control.selectedText === "") {
+                if (internal.selectionEnd == internal.selectionStart) {
                     internal.resetEditorSelection(mouse.x);
                     internal.selectionMode = true;
                 }

=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-03-17 18:17:23 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-04-09 21:55:48 +0000
@@ -33,9 +33,7 @@
         }
         Action {
             text: i18n.tr("Cut")
-            // If paste/editing is not possible, then disable also "Cut" operation
-            // It is applicable for ReadOnly's TextFields and TextAreas
-            enabled: target && target.selectedText !== "" && target.canPaste
+            enabled: target && target.selectedText !== ""
             onTriggered: target.cut()
         }
         Action {

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml	2014-04-09 21:55:48 +0000
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2012 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 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Item {
+    id: headerStyle
+    /*!
+      The height of the headercontents, which is the full height of
+      the header minus the separators shown at the bottom of it.
+     */
+    property real contentHeight: units.gu(7.5)
+
+    /*!
+      The source of the image that separates the header from the contents of a \l MainView.
+      The separator will be drawn over the contents.
+     */
+    property url separatorSource: "artwork/PageHeaderBaseDividerLight.sci"
+
+    /*!
+      The source of an additional image attached to the bottom of the separator. The contents
+      of the \l MainView will be drawn on top of the separator bottom image.
+     */
+    property url separatorBottomSource: "artwork/PageHeaderBaseDividerBottom.png"
+
+    property int fontWeight: Font.Light
+    property string fontSize: "x-large"
+    property color textColor: Theme.palette.selected.backgroundText
+    property real textLeftMargin: units.gu(2)
+
+    implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
+
+    BorderImage {
+        id: separator
+        anchors {
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+        source: headerStyle.separatorSource
+    }
+    Image {
+        id: separatorBottom
+        anchors {
+            top: separator.bottom
+            left: parent.left
+            right: parent.right
+        }
+        source: headerStyle.separatorBottomSource
+    }
+
+    Item {
+        id: leftButtonContainer
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        width: childrenRect.width
+
+        AbstractButton {
+            id: tabsButton
+            objectName: "tabsButton"
+            height: parent ? parent.height : undefined
+            width: visible ? units.gu(5) : 0
+
+            iconName: "navigation-menu"
+            visible: styledItem.tabsModel !== null
+            text: visible ? styledItem.tabsModel.count + " tabs" : ""
+
+            // XXX: We currently use an AbstractButton with ToolbarButtonStyle because
+            //  a ToolbarButton does not has its own MouseArea to handle interaction,
+            //  that was done in the Toolbar.
+            style: Theme.createStyleComponent("ToolbarButtonStyle.qml", tabsButton)
+
+            onTriggered: {
+                tabsPopover.show();
+            }
+
+            Popover {
+                id: tabsPopover
+                objectName: "tabsPopover"
+                parent: QuickUtils.rootItem(tabsPopover)
+                caller: tabsButton
+                Column {
+                    anchors {
+                        left: parent.left
+                        top: parent.top
+                        right: parent.right
+                    }
+                    Repeater {
+                        model: styledItem.tabsModel
+                        ListItem.Standard {
+                            visible: index !== styledItem.tabsModel.selectedIndex
+                            text: tab.title // XXX: only "title" doesn't work with i18n.tr(). Why not?
+                            objectName: "tabButton" + index
+                            onClicked: {
+                                styledItem.tabsModel.selectedIndex = index;
+                                tabsPopover.hide();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Item {
+        id: foreground
+        anchors {
+            left: leftButtonContainer.right
+            right: parent.right
+            top: parent.top
+        }
+        height: headerStyle.contentHeight
+
+        Label {
+            LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
+
+            anchors {
+                left: parent.left
+                verticalCenter: parent.verticalCenter
+                leftMargin: headerStyle.textLeftMargin
+            }
+            text: styledItem.title
+            font.weight: headerStyle.fontWeight
+            fontSize: headerStyle.fontSize
+            color: headerStyle.textColor
+        }
+    }
+}

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-09 21:55:48 +0000
@@ -116,8 +116,10 @@
                 AbstractButton {
                     id: button
                     anchors {
-                        top: parent.top
-                        bottom: parent.bottom
+                        // parent may not exist when closing an app which
+                        //  causes TypeErrors
+                        top: parent ? parent.top : undefined
+                        bottom: parent ? parent.bottom : undefined
                     }
                     width: text.paintedWidth + text.anchors.leftMargin + text.anchors.rightMargin
 
@@ -212,7 +214,7 @@
                         if (mouseArea.enteringSelectionMode) {
                             mouseArea.enteringSelectionMode = false;
                         } else if (opacity > 0.0) {
-                            styledItem.selectedIndex = index;
+                            styledItem.model.selectedIndex = index;
                             if (!styledItem.alwaysSelectionMode) {
                                 styledItem.selectionMode = false;
                             }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2013-12-04 10:47:19 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-04-09 21:55:48 +0000
@@ -4,6 +4,7 @@
 internal CheckBoxStyle CheckBoxStyle.qml
 internal DialogForegroundStyle DialogForegroundStyle.qml
 internal HeaderStyle HeaderStyle.qml
+internal NewHeaderStyle NewHeaderStyle.qml
 MainViewStyle 0.1 MainViewStyle.qml
 ListItemOptionSelector 0.1 ListItemOptionSelector.qml
 OptionSelectorStyle 0.1 OptionSelectorStyle.qml

=== added file 'modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp'
--- modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp	2014-04-09 21:55:48 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013 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/>.
+ *
+ */
+
+#include "bottombarvisibilitycommunicator.h"
+
+#include <QDBusInterface>
+
+static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";
+static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_INTERFACE = "com.canonical.Shell.BottomBarVisibilityCommunicator";
+static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";
+
+/*!
+    \internal
+
+    BottomBarVisibilityCommunicator controller is used to communicate with the Shell BottomBarVisibilityCommunicator.
+    This class allows for the bottom edge interaction to happen
+
+    The shell can control the bottom bar behaviour:
+     * forceHidden: If set to true, the bottom bar has to be forced to be hidden
+*/
+
+BottomBarVisibilityCommunicator::BottomBarVisibilityCommunicator()
+ : m_shellDbusIface(NULL),
+   m_position(0),
+   m_forceHidden(false)
+{
+    m_shellDbusIface = new QDBusInterface(DBUS_SERVICE, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_INTERFACE, QDBusConnection::sessionBus(), this);
+    if (m_shellDbusIface->isValid()) {
+        connect(m_shellDbusIface, SIGNAL(forceHiddenChanged(bool)), SLOT(onShellForceHiddenChanged(bool)));
+
+        const bool forceHidden = m_shellDbusIface->property("forceHidden").toDouble();
+        onShellForceHiddenChanged(forceHidden);
+    }
+}
+
+bool BottomBarVisibilityCommunicator::forceHidden() const
+{
+    return m_forceHidden;
+}
+
+double BottomBarVisibilityCommunicator::position() const
+{
+    return m_position;
+}
+
+void BottomBarVisibilityCommunicator::setPosition(double position)
+{
+    if (position != m_position) {
+        m_position = position;
+        m_shellDbusIface->setProperty("position", position);
+        Q_EMIT positionChanged(position);
+    }
+}
+
+void BottomBarVisibilityCommunicator::onShellForceHiddenChanged(bool forceHidden)
+{
+    if (forceHidden != m_forceHidden) {
+        m_forceHidden = forceHidden;
+        Q_EMIT forceHiddenChanged(forceHidden);
+    }
+}

=== added file 'modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h'
--- modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h	2014-04-09 21:55:48 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013 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/>.
+ *
+ */
+
+#ifndef BOTTOMBARVISIBILITYCOMMUNICATOR_H
+#define BOTTOMBARVISIBILITYCOMMUNICATOR_H
+
+#include <QObject>
+
+class QDBusInterface;
+
+class BottomBarVisibilityCommunicator : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool forceHidden READ forceHidden NOTIFY forceHiddenChanged)
+    Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)
+
+public:
+    static BottomBarVisibilityCommunicator& instance() {
+        static BottomBarVisibilityCommunicator instance;
+        return instance;
+    }
+
+    bool forceHidden() const;
+    double position() const;
+    void setPosition(double position);
+
+Q_SIGNALS:
+    void forceHiddenChanged(bool forceHidden);
+    void positionChanged(double position);
+
+private Q_SLOTS:
+    void onShellForceHiddenChanged(bool forceHidden);
+
+private:
+    BottomBarVisibilityCommunicator();
+
+    QDBusInterface* m_shellDbusIface;
+
+    double m_position;
+
+    // This is cached from dbus
+    bool m_forceHidden;
+};
+
+#endif

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.h	2014-03-20 10:01:21 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h	2014-04-09 21:55:48 +0000
@@ -17,7 +17,6 @@
 #define INVERSEMOUSEAREATYPE_H
 
 #include <private/qquickmousearea_p.h>
-#include <QtCore/QPointer>
 
 class QQuickItem;
 class InverseMouseAreaType : public QQuickMouseArea
@@ -45,7 +44,7 @@
     void setSensingArea(QQuickItem *sensing);
     bool topmostItem() const;
     void setTopmostItem(bool value);
-    QEvent * mapEventToArea(QObject *target, QEvent *event, QPoint &point);
+    QEvent * mapEventToArea(QObject *target, QEvent *event);
 
 Q_SIGNALS:
     void sensingAreaChanged();
@@ -53,17 +52,11 @@
 
 private Q_SLOTS:
     void update();
-    void resetFilterOnWindowUpdate(QQuickWindow *win);
     
 private:
-    bool m_ready:1;
-    bool m_topmostItem:1;
-    bool m_filteredEvent:1;
-    QPointer<QObject> m_filterHost;
-    QPointer<QQuickItem> m_sensingArea;
-    int m_touchId;
-
-    void updateEventFilter(bool enable);
+    bool m_ready;
+    bool m_topmostItem;
+    QQuickItem *m_sensingArea;
 };
 
 #endif // INVERSEMOUSEAREATYPE_H

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-03-05 12:29:58 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-04-09 21:55:48 +0000
@@ -35,6 +35,7 @@
 #include "inversemouseareatype.h"
 #include "qquickclipboard.h"
 #include "qquickmimedata.h"
+#include "bottombarvisibilitycommunicator.h"
 #include "thumbnailgenerator.h"
 #include "ucubuntuanimation.h"
 #include "ucfontutils.h"
@@ -224,6 +225,8 @@
     QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()),
                      fontUtilsListener, SLOT(updateContextProperty()));
 
+    context->setContextProperty("bottomBarVisibilityCommunicator", &BottomBarVisibilityCommunicator::instance());
+
     engine->addImageProvider(QLatin1String("scaling"), new UCScalingImageProvider);
 
     // register icon provider

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-03-25 06:46:36 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-04-09 21:55:48 +0000
@@ -36,6 +36,7 @@
     shapeitemtexture.h \
     shapeitem.h \
     inversemouseareatype.h \
+    bottombarvisibilitycommunicator.h \
     qquickclipboard.h \
     qquickmimedata.h \
     qquickclipboard_p.h \
@@ -73,6 +74,7 @@
     quickutils.cpp \
     shapeitem.cpp \
     inversemouseareatype.cpp \
+    bottombarvisibilitycommunicator.cpp \
     qquickclipboard.cpp \
     qquickmimedata.cpp \
     ucubuntuanimation.cpp \

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2014-03-20 15:46:28 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2014-04-09 21:55:48 +0000
@@ -113,7 +113,7 @@
 QString QuickUtils::className(QObject *item)
 {
     if (!item) {
-        return QString("(null)");
+        return QString();
     }
     QString result = item->metaObject()->className();
     return result.left(result.indexOf("_QML"));

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.h'
--- modules/Ubuntu/Components/plugin/quickutils.h	2014-03-20 15:46:28 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.h	2014-04-09 21:55:48 +0000
@@ -41,7 +41,7 @@
     Q_INVOKABLE QQuickItem *rootItem(QObject *object);
     QString inputMethodProvider() const;
 
-    Q_INVOKABLE static QString className(QObject *item);
+    Q_INVOKABLE QString className(QObject *item);
     QObject* createQmlObject(const QUrl &url, QQmlEngine *engine);
 
 Q_SIGNALS:

=== modified file 'modules/Ubuntu/Test/Test.pro'
--- modules/Ubuntu/Test/Test.pro	2013-12-16 17:37:48 +0000
+++ modules/Ubuntu/Test/Test.pro	2014-04-09 21:55:48 +0000
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS += plugin
 OTHER_FILES += $$system(ls *.qml)
 include(deployment.pri)
 

=== removed directory 'modules/Ubuntu/Test/plugin'
=== removed file 'modules/Ubuntu/Test/plugin/plugin.pro'
--- modules/Ubuntu/Test/plugin/plugin.pro	2013-12-16 17:37:48 +0000
+++ modules/Ubuntu/Test/plugin/plugin.pro	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-TEMPLATE = lib
-TARGET = ../UbuntuTest
-QT += core-private qml qml-private quick quick-private
-
-equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
-    QT += v8-private
-}
-
-CONFIG += qt plugin no_keywords
-
-QMAKE_CXXFLAGS += -Werror
-
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = Ubuntu.Test
-
-HEADERS += \
-    uctestcase.h \
-
-SOURCES += \
-    uctestcase.cpp \
-
-# deployment rules for the plugin
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-target.path = $$installPath
-INSTALLS += target

=== removed file 'modules/Ubuntu/Test/plugin/uctestcase.cpp'
--- modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-03-19 12:48:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.cpp	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright 2013-2014 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: Christian Dywan <[e-mail]>
- */
-
-#include "uctestcase.h"
-
-#include <stdlib.h>
-
-#include <QtQml/QQmlEngine>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-#include <QtTest/QtTest>
-#include <QtQuick/QQuickItem>
-
-/*!
- * \ingroup ubuntu
- * \brief UbuntuTestCase is the C++ pendant to the QML UbuntuTestCase.
- */
-UbuntuTestCase::UbuntuTestCase(const QString& file, QWindow* parent) : QQuickView(parent)
-{
-    QString modules("../../../modules");
-    Q_ASSERT(QDir(modules).exists());
-    QString modulePath(QDir(modules).absolutePath());
-    engine()->addImportPath(modulePath);
-
-    m_spy = new QSignalSpy(engine(), SIGNAL(warnings(QList<QQmlError>)));
-    m_spy->setParent(this);
-
-    Q_ASSERT(!file.isEmpty());
-    setSource(QUrl::fromLocalFile(file));
-    Q_ASSERT(status() == QQuickView::Ready);
-    Q_ASSERT(rootObject());
-    show();
-    QTest::qWaitForWindowExposed(this);
-}
-

=== removed file 'modules/Ubuntu/Test/plugin/uctestcase.h'
--- modules/Ubuntu/Test/plugin/uctestcase.h	2014-03-19 12:48:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright 2013-2014 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: Christian Dywan <[e-mail]>
- */
-
-#ifndef UBUNTU_TEST_UBUNTUTESTCASE_H
-#define UBUNTU_TEST_UBUNTUTESTCASE_H
-
-#include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickView>
-#include <QtTest/QSignalSpy>
-
-class UbuntuTestCase : public QQuickView
-{
-    Q_OBJECT
-
-public:
-    UbuntuTestCase(const QString& file, QWindow* parent = 0);
-    // getter
-    template<class T>
-    inline T findItem(const QString& objectName) const {
-        T item = rootObject()->findChild<T>(objectName);
-        if (item)
-            return item;
-        if (rootObject()->findChild<QObject*>(objectName))
-            qFatal("Item '%s' found with unexpected type", qPrintable(objectName));
-        qFatal("No item '%s' found", qPrintable(objectName));
-    }
-
-private:
-    QSignalSpy* m_spy;
-};
-
-#endif // UBUNTU_TEST_UBUNTUTESTCASE_H

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-08 14:46:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-09 21:55:48 +0000
@@ -143,20 +143,12 @@
         current_tab.visible.wait_for(True)
         return current_tab
 
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_tab_by_index(self, index):
-        """Open a tab.
-
-        :parameter index: The index of the tab to open.
-        :return: The newly opened tab.
-        :raise ToolkitEmulatorException: If the tab index is out of range.
-
-        """
-        logger.debug('Switch to tab with index {0}.'.format(index))
+    def _switch_to_tab_in_deprecated_tabbar_by_index(self, index):
         tabs = self.get_tabs()
         number_of_tabs = tabs.get_number_of_tabs()
         if index >= number_of_tabs:
             raise ToolkitEmulatorException('Tab index out of range.')
+
         current_tab = tabs.get_current_tab()
         number_of_switches = 0
         while not tabs.selectedTabIndex == index:
@@ -171,6 +163,33 @@
             number_of_switches += 1
         return current_tab
 
+    def _switch_to_tab_in_drawer_by_index(self, index):
+        tabs = self.get_tabs()
+        number_of_tabs = tabs.get_number_of_tabs()
+        if index >= number_of_tabs:
+            raise ToolkitEmulatorException('Tab index out of range.')
+
+        if (index != tabs.selectedTabIndex):
+            self.get_header().switch_to_tab_by_index(index)
+        current_tab = tabs.get_current_tab()
+        return current_tab
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_tab_by_index(self, index):
+        """Open a tab.
+
+        :parameter index: The index of the tab to open.
+        :return: The newly opened tab.
+        :raise ToolkitEmulatorException: If the tab index is out of range.
+
+        """
+        logger.debug('Switch to tab with index {0}.'.format(index))
+
+        if (self.useDeprecatedToolbar):
+            return self._switch_to_tab_in_deprecated_tabbar_by_index(index)
+        else:
+            return self._switch_to_tab_in_drawer_by_index(index)
+
     @autopilot_logging.log_action(logger.info)
     def switch_to_previous_tab(self):
         """Open the previous tab.
@@ -226,16 +245,13 @@
         self.pointing_device = get_pointing_device()
 
     def _get_animating(self):
-        tab_bar_style = self.select_single('TabBarStyle')
-        return tab_bar_style.animating
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_next_tab(self):
-        """Open the next tab.
-
-        :raise ToolkitEmulatorException: If the main view has no tabs.
-
-        """
+        if (self.useDeprecatedToolbar):
+            tab_bar_style = self.select_single('TabBarStyle')
+            return tab_bar_style.animating
+        else:
+            return False
+
+    def _switch_to_next_tab_in_deprecated_tabbar(self):
         try:
             tab_bar = self.select_single(TabBar)
         except dbus.StateNotFoundError:
@@ -243,6 +259,57 @@
         tab_bar.switch_to_next_tab()
         self._get_animating().wait_for(False)
 
+    def _switch_to_next_tab_in_drawer(self):
+        tabs_model_properties = self.select_single(
+            'QQuickItem', objectName='tabsModelProperties')
+        next_tab_index = (tabs_model_properties.selectedIndex
+                          + 1) % tabs_model_properties.count
+        self._switch_to_tab_in_drawer_by_index(next_tab_index)
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_next_tab(self):
+        """Open the next tab.
+
+        :raise ToolkitEmulatorException: If the main view has no tabs.
+
+        """
+        if (self.useDeprecatedToolbar):
+            self._switch_to_next_tab_in_deprecated_tabbar()
+        else:
+            self._switch_to_next_tab_in_drawer()
+
+    def _switch_to_tab_in_drawer_by_index(self, index):
+        try:
+            tabs_drawer_button = self.select_single(
+                'AbstractButton', objectName='tabsButton')
+        except dbus.StateNotFoundError:
+            raise ToolkitEmulatorException(_NO_TABS_ERROR)
+        self.pointing_device.click_object(tabs_drawer_button)
+
+        try:
+            tab_button = self.get_root_instance().select_single(
+                'Standard', objectName='tabButton' + str(index))
+        except dbus.StateNotFoundError:
+            raise ToolkitEmulatorException(
+                "Tab button {0} not found.".format(index))
+
+        self.pointing_device.click_object(tab_button)
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_tab_by_index(self, index):
+        """Open a tab. This only supports the new tabs in the header
+
+        :parameter index: The index of the tab to open.
+        :raise ToolkitEmulatorException: If the tab index is out of range or
+                useDeprecatedToolbar is set.
+
+        """
+        if (self.useDeprecatedToolbar):
+            raise ToolkitEmulatorException(
+                "Header.swtich_to_tab_by_index only works with new header")
+        else:
+            self._switch_to_tab_in_drawer_by_index(index)
+
 
 class Toolbar(UbuntuUIToolkitEmulatorBase):
     """Toolbar Autopilot emulator."""

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-22 06:53:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-09 21:55:48 +0000
@@ -242,56 +242,66 @@
             'Toolbar must be opened before calling click_button().')
 
 
-class TabsTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
+TEST_TABS_QML_FORMAT = ("""
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 
-MainView {
+MainView {{
     width: units.gu(70)
     height: units.gu(60)
+    useDeprecatedToolbar: {use_deprecated_toolbar}
 
-    Tabs {
+    Tabs {{
         id: tabs
-        Tab {
+        Tab {{
             objectName: "tab1"
             title: "Tab1"
-            Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
+            Page {{
+                tools: ToolbarItems {{
+                    ToolbarButton {{
                         text: "Test1"
-                    }
-                }
-            }
-        }
-        Tab {
+                    }}
+                }}
+            }}
+        }}
+        Tab {{
             objectName: "tab2"
             title: "Tab2"
-            Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
+            Page {{
+                tools: ToolbarItems {{
+                    ToolbarButton {{
                         text: "Test2"
-                    }
-                }
-            }
-        }
-        Tab {
+                    }}
+                }}
+            }}
+        }}
+        Tab {{
             objectName: "tab3"
             title: "Tab3"
-            Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
+            Page {{
+                tools: ToolbarItems {{
+                    ToolbarButton {{
                         text: "Test3"
-                    }
-                }
-            }
-        }
-    }
-}
+                    }}
+                }}
+            }}
+        }}
+    }}
+}}
 """)
 
+
+class TabsTestCase(tests.QMLStringAppTestCase):
+
+    scenarios = [
+        ('deprecated tabs', dict(
+            test_qml=TEST_TABS_QML_FORMAT.format(
+                use_deprecated_toolbar='true'))),
+        ('drawer tabs', dict(
+            test_qml=TEST_TABS_QML_FORMAT.format(
+                use_deprecated_toolbar='false')))
+    ]
+
     def test_tabs_custom_emulator(self):
         self.assertIsInstance(self.main_view.get_tabs(), emulators.Tabs)
 

=== modified file 'tests/resources/navigation/SimpleTabs.qml'
--- tests/resources/navigation/SimpleTabs.qml	2013-11-20 18:00:41 +0000
+++ tests/resources/navigation/SimpleTabs.qml	2014-04-09 21:55:48 +0000
@@ -20,6 +20,8 @@
 MainView {
     width: 800
     height: 600
+    useDeprecatedToolbar: false
+
     Tabs {
         id: tabs
         selectedTabIndex: 1

=== modified file 'tests/resources/navigation/StackWithTabs.qml'
--- tests/resources/navigation/StackWithTabs.qml	2013-08-01 13:08:32 +0000
+++ tests/resources/navigation/StackWithTabs.qml	2014-04-09 21:55:48 +0000
@@ -21,6 +21,7 @@
     id: mainView
     width: units.gu(38)
     height: units.gu(50)
+    useDeprecatedToolbar: true
 
     PageStack {
         id: pageStack
@@ -34,56 +35,45 @@
                     Button {
                         anchors.centerIn: parent
                         onClicked: pageStack.push(page3)
-                        text: "Press"
+                        text: "Push to stack"
                     }
                 }
             }
             Tab {
                 title: "Tab 2"
                 page: Page {
-                    Column {
-                        anchors {
-                            centerIn: parent
-                        }
-                        width: childrenRect.width
-                        height: childrenRect.height
-                        spacing: units.gu(1)
-
-                        Label {
-                            text: "Tab bar always in selection mode?"
-                        }
-                        Switch {
-                            id: alwaysSelectionModeSwitch
-                            Binding {
-                                target: tabs.tabBar
-                                property: "alwaysSelectionMode"
-                                value: alwaysSelectionModeSwitch.checked
-                            }
-                        }
-                        Label {
-                            text: "Animate tab bar."
-                        }
-                        Switch {
-                            id: animateSwitch
-                            checked: true
-                            Binding {
-                                target: tabs.tabBar
-                                property: "animate"
-                                value: animateSwitch.checked
-                            }
-                        }
+                    Button {
+                        anchors.centerIn: parent
+                        text: "Switch to tab 1"
+                        onClicked: tabs.selectedTabIndex = 0
                     }
                 }
             }
         }
         Page {
             id: page3
+            active: parent.active
             visible: false
             title: "Page on stack"
             Label {
                 anchors.centerIn: parent
                 text: "Press back to return to the tabs"
             }
+
+            Loader {
+                // FIXME: This Loader is a temporary solution, when the back
+                //  button in in the header it is no longer needed.
+                active: !mainView.useDeprecatedToolbar
+                sourceComponent: Button {
+                    onClicked: pageStack.pop()
+                    text: "Back"
+                }
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    bottom: parent.bottom
+                    bottomMargin: units.gu(1)
+                }
+            }
         }
     }
 }

=== modified file 'tests/resources/navigation/Tabs.qml'
--- tests/resources/navigation/Tabs.qml	2014-04-07 10:03:39 +0000
+++ tests/resources/navigation/Tabs.qml	2014-04-09 21:55:48 +0000
@@ -19,8 +19,10 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 MainView {
+    id: mainView
     width: 800
     height: 600
+    useDeprecatedToolbar: false
 
     Tabs {
         id: tabs
@@ -33,6 +35,10 @@
             id: simpleTab
             title: i18n.tr("Simple page #" + index)
             page: Page {
+<<<<<<< TREE
+=======
+                title: "Selected page title"
+>>>>>>> MERGE-SOURCE
                 Row {
                     anchors.centerIn: parent
                     spacing: units.gu(1)
@@ -40,12 +46,12 @@
                     height: childrenRect.height
                     Button {
                         text: "tab bar on"
-                        enabled: !tabs.tabBar.selectionMode
+                        enabled: mainView.useDeprecatedToolbar && !tabs.tabBar.selectionMode
                         onClicked: tabs.tabBar.selectionMode = true;
                     }
                     Button {
                         text: "tab bar off"
-                        enabled: tabs.tabBar.selectionMode
+                        enabled: mainView.useDeprecatedToolbar && tabs.tabBar.selectionMode
                         onClicked: tabs.tabBar.selectionMode = false;
                     }
                 }

=== modified file 'tests/unit/plugin_dependency.pri'
--- tests/unit/plugin_dependency.pri	2013-12-16 17:37:48 +0000
+++ tests/unit/plugin_dependency.pri	2014-04-09 21:55:48 +0000
@@ -1,10 +1,7 @@
 COMPONENTS_PATH = ../../../modules/Ubuntu/Components
 INCLUDEPATH += $$COMPONENTS_PATH/plugin
-INCLUDEPATH += ../../../modules/Ubuntu/Test/plugin
 PRE_TARGETDEPS = $$COMPONENTS_PATH/libUbuntuComponents.so
-PRE_TARGETDEPS += ../../../modules/Ubuntu/Test/libUbuntuTest.so
 LIBS += $$COMPONENTS_PATH/libUbuntuComponents.so
-LIBS += ../../../modules/Ubuntu/Test/libUbuntuTest.so
 DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
 QMAKE_CXXFLAGS += -Werror
 

=== modified file 'tests/unit_x11/tst_components/tst_tabbar.qml'
--- tests/unit_x11/tst_components/tst_tabbar.qml	2014-04-08 12:38:35 +0000
+++ tests/unit_x11/tst_components/tst_tabbar.qml	2014-04-09 21:55:48 +0000
@@ -60,6 +60,7 @@
 
     ListModel {
         id: pages
+        property int selectedIndex: 0
         ListElement {
             title: "Tab 1"
         }
@@ -79,6 +80,7 @@
 
     ListModel {
         id: invalidModel
+        property int selectedIndex: 0
         ListElement {
             fruit: "Pear"
         }
@@ -86,6 +88,7 @@
 
     ListModel {
         id: invalidModelTab
+        property int selectedIndex: 0
         ListElement {
             tab: "Pear"
         }
@@ -98,18 +101,22 @@
 
     ListModel {
         id: validModelTab
+        property int selectedIndex: count > 0 ? 0 : -1
     }
 
     ListModel {
         id: emptyModelWillBeInvalid
+        property int selectedIndex: count > 0 ? 0 : -1
     }
 
     ListModel {
         id: emptyModel
+        property int selectedIndex: count > 0 ? 0 : -1
     }
 
     TabsModel {
         id: pagesCpp
+        property int selectedIndex: count > 0 ? 0 : -1
     }
 
     Label {

=== removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaClip.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaClip.qml	2014-03-20 15:30:06 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaClip.qml	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright 2014 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 0.1
-
-Rectangle {
-    color: "yellow"
-    width: units.gu(70)
-    height: units.gu(70)
-
-    property InverseMouseArea ima: imaItem
-
-    Label {
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            top: parent.top
-        }
-        text: "Root"
-    }
-
-    Rectangle {
-        color: "green"
-        width: units.gu(50)
-        height: units.gu(50)
-        anchors.centerIn: parent
-        clip: true
-
-        Label {
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-                top: parent.top
-            }
-            text: "Clipper"
-        }
-
-        Rectangle {
-            width: units.gu(30)
-            height: units.gu(30)
-            color: "lightgrey"
-            anchors.centerIn: parent
-
-            Label {
-                anchors {
-                    horizontalCenter: parent.horizontalCenter
-                    top: parent.top
-                }
-                text: "Inverse mouse area"
-            }
-
-            InverseMouseArea {
-                id: imaItem
-                objectName: "Test_IMA"
-                anchors.fill: parent
-                topmostItem: true
-                clip: false
-            }
-        }
-    }
-}

=== removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInFlickable.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInFlickable.qml	2014-03-20 15:30:06 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInFlickable.qml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2014 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 0.1
-import Ubuntu.Components.ListItems 0.1
-
-MainView {
-    id: root
-    width: units.gu(40)
-    height: units.gu(71)
-
-    property InverseMouseArea ima: null
-
-    Page {
-        title: "Test"
-
-        Flickable {
-            id: list
-            objectName: "ListView"
-            anchors.fill: parent
-            contentHeight: units.gu(100)
-
-            Rectangle {
-                width: 100
-                height: 100
-                anchors.centerIn: parent
-
-                InverseMouseArea {
-                    id: ima
-                    objectName: "Test_IMA"
-                    anchors.fill: parent
-                    topmostItem: true
-                    Component.onCompleted: root.ima = ima
-               }
-            }
-        }
-    }
-}

=== removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInPage.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInPage.qml	2014-03-20 15:30:06 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInPage.qml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 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 0.1
-
-MainView {
-    id: root
-    width: units.gu(40)
-    height: units.gu(71)
-
-    property InverseMouseArea ima: imaItem
-
-    Page {
-        title: "Test"
-
-        Rectangle {
-            objectName: "Card"
-            width: parent.width - units.gu(5)
-            height: units.gu(50)
-            anchors.centerIn: parent
-            color: "blue"
-
-            InverseMouseArea {
-                id: imaItem
-                objectName: "Test_IMA"
-                anchors.fill: parent
-                topmostItem: true
-                Component.onCompleted: root.ima = ima
-            }
-        }
-    }
-}

=== modified file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTop.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTop.qml	2014-03-20 15:30:06 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTop.qml	2014-04-09 21:55:48 +0000
@@ -38,6 +38,8 @@
             objectName: "MA1"
             anchors.fill: parent
             z: 1
+            onPressed: print("MA1")
+            onDoubleClicked: print("DMA1")
         }
     }
 
@@ -61,11 +63,15 @@
         MouseArea {
             objectName: "MA2"
             anchors.fill: parent
+            onPressed: print("MA2")
+            onDoubleClicked: print("DMA2")
         }
 
         InverseMouseArea {
             objectName: "IMA"
             anchors.fill: button
+            onPressed: print("IMA")
+            onDoubleClicked: print("DIMA")
         }
     }
 }

=== modified file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml	2014-03-20 15:30:06 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml	2014-04-09 21:55:48 +0000
@@ -38,6 +38,8 @@
             objectName: "MA1"
             anchors.fill: parent
             z: 1
+            onPressed: print("MA1")
+            onDoubleClicked: print("DMA1")
         }
     }
 
@@ -61,12 +63,15 @@
         MouseArea {
             objectName: "MA2"
             anchors.fill: parent
+            onPressed: print("MA2")
+            onDoubleClicked: print("DMA2")
         }
 
         InverseMouseArea {
             objectName: "IMA"
             anchors.fill: button
-            onPressed: mouse.accepted = false
+            onPressed: {mouse.accepted = false; print("IMA")}
+            onDoubleClicked: print("DIMA")
         }
     }
 }

=== removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaParentClipped.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaParentClipped.qml	2014-03-20 15:30:06 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaParentClipped.qml	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 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 0.1
-
-MainView {
-    id: root
-    width: units.gu(40)
-    height: units.gu(71)
-
-    property InverseMouseArea ima: null
-    Component {
-        id: imaComponent
-        InverseMouseArea {
-            id: ima
-            objectName: "Test_IMA"
-            anchors.fill: parent
-            topmostItem: true
-            Component.onCompleted: root.ima = ima
-        }
-    }
-
-    Component.onCompleted: loader.sourceComponent = imaComponent
-
-    Page {
-        title: "Test"
-
-        Rectangle {
-            objectName: "Card"
-            width: parent.width - units.gu(5)
-            height: units.gu(50)
-            anchors.centerIn: parent
-            color: "teal"
-            clip: true
-
-            Loader {
-                id: loader
-                anchors.fill: parent
-            }
-        }
-    }
-}

=== modified file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaTopmostItem.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaTopmostItem.qml	2014-03-19 14:24:20 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaTopmostItem.qml	2014-04-09 21:55:48 +0000
@@ -23,16 +23,6 @@
     objectName: "ROOT"
 
     Rectangle {
-        x: 110; y: 10
-        width: 100; height: 100
-        color: "red"
-        MouseArea {
-            anchors.fill: parent
-            objectName: "MA"
-        }
-    }
-
-    Rectangle {
         x: 10; y: 10
         width: 100; height: 100
         color: "blue"
@@ -43,4 +33,13 @@
         }
     }
 
+    Rectangle {
+        x: 110; y: 10
+        width: 100; height: 100
+        color: "red"
+        MouseArea {
+            anchors.fill: parent
+            objectName: "MA"
+        }
+    }
 }

=== modified file 'tests/unit_x11/tst_layouts/tst_layouts.cpp'
--- tests/unit_x11/tst_layouts/tst_layouts.cpp	2014-03-19 12:48:33 +0000
+++ tests/unit_x11/tst_layouts/tst_layouts.cpp	2014-04-09 21:55:48 +0000
@@ -28,7 +28,6 @@
 
 #include "ullayouts.h"
 #include "ucunits.h"
-#include "uctestcase.h"
 #include <QtQuick/private/qquickanchors_p.h>
 #include <QtQuick/private/qquickanchors_p_p.h>
 
@@ -59,8 +58,18 @@
 
     QQuickView * loadTest(const QString &file)
     {
-        UbuntuTestCase* testCase = new UbuntuTestCase(file);
-        return qobject_cast<QQuickView*>(testCase);
+        QQuickView *view = new QQuickView;
+        view->engine()->addImportPath(m_modulePath);
+
+        view->setSource(QUrl::fromLocalFile(file));
+        if (!view->rootObject()) {
+            delete view;
+            view = 0;
+        } else {
+            view->show();
+            QTest::qWaitForWindowExposed(view);
+        }
+        return view;
     }
 
     QQuickItem *testItem(QQuickItem *that, const QString &identifier)
@@ -76,6 +85,10 @@
 private Q_SLOTS:
     void initTestCase()
     {
+        QString modules("../../../modules");
+        QVERIFY(QDir(modules).exists());
+
+        m_modulePath = QDir(modules).absolutePath();
     }
 
     void cleanupTestCase()
@@ -84,8 +97,12 @@
 
     void testCase_NoLayouts()
     {
-        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("NoLayouts.qml"));
-        ULLayouts *layouts = testCase->findItem<ULLayouts*>("layouts");
+        QScopedPointer<QQuickView> view(loadTest("NoLayouts.qml"));
+        QVERIFY(view);
+
+        ULLayouts *layouts = qobject_cast<ULLayouts*>(testItem(view->rootObject(), "layouts"));
+        QVERIFY(layouts);
+
         QVERIFY(layouts->layoutList().isEmpty());
     }