Merge lp:~zsombi/ubuntu-ui-toolkit/10-viewitem into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

New ListItem component. Component and its background grouped property.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1186
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/957/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/789/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/789/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/789/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5573/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/957/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/10-viewitem]

1187. By Zsombor Egri on 2014-09-04

prereq merge

1188. By Zsombor Egri on 2014-09-04

More performance gain by using implicitWidth/implicitHeight, and in this way we can get rid of the additional QML component with bindings. No more need for the owningItem property either, which was introduced to help deciding from whom to take the width. Performance almost doubled in this way.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1188
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/970/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/802/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/802/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/802/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5676/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/970/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/10-viewitem]

1189. By Zsombor Egri on 2014-09-04

minor updates on documentation; background renamed to contentItem, suits better for what it actually does

1190. By Zsombor Egri on 2014-09-04

API updated

1191. By Zsombor Egri on 2014-09-04

test updated

1192. By Zsombor Egri on 2014-09-04

staging merge

1193. By Zsombor Egri on 2014-09-05

staging sync

1194. By Zsombor Egri on 2014-09-05

staging merge

1195. By Zsombor Egri on 2014-09-08

more benchmarks added

1196. By Zsombor Egri on 2014-09-15

height set to 7 GU

1197. By Zsombor Egri on 2014-09-15

documentation and versioning fix

1198. By Zsombor Egri on 2014-09-15

API updated

1199. By Zsombor Egri on 2014-09-15

colors moved into ListItem

1200. By Zsombor Egri on 2014-09-15

documentation fixed

1201. By Zsombor Egri on 2014-09-18

staging merge

1202. By Zsombor Egri on 2014-09-19

staging sync

1203. By Zsombor Egri on 2014-09-24

staging merge

1204. By Zsombor Egri on 2014-09-29

staging sync

1205. By Zsombor Egri on 2014-10-02

staging sync

1206. By Zsombor Egri on 2014-10-02

pressedColor changed into highlightColor

1207. By Zsombor Egri on 2014-10-02

API updated

1208. By Zsombor Egri on 2014-10-13

staging sync

1209. By Zsombor Egri on 2014-10-18

fix activeFocusOnSet defaulting and setFocused override

1210. By Zsombor Egri on 2014-10-18

staging sync

1211. By Zsombor Egri on 2014-10-24

staging sync

1212. By Zsombor Egri on 2014-11-04

staging sync

1213. By Zsombor Egri on 2014-11-06

staging merge

1214. By Zsombor Egri on 2014-11-19

staging sync

Unmerged revisions

=== modified file 'components.api'
--- components.api	2014-08-26 14:16:46 +0000
+++ components.api	2014-09-04 06:44:23 +0000
@@ -43,22 +43,6 @@
 CheckBox 0.1 1.0
 AbstractButton
     property bool checked
-modules/Ubuntu/Components/Colors/UbuntuColors.qml
-QtObject
-    readonly property color orange
-    readonly property color lightAubergine
-    readonly property color midAubergine
-    readonly property color darkAubergine
-    readonly property color warmGrey
-    readonly property color coolGrey
-    property Gradient orangeGradient
-    property Gradient greyGradient
-    readonly property color lightGrey
-    readonly property color darkGrey
-    readonly property color red
-    readonly property color green
-    readonly property color blue
-    readonly property color purple
 ComboButton 1.1
 Button
     property bool expanded
@@ -98,6 +82,8 @@
 Label 0.1 1.0
 Text
     property string fontSize
+ListItem 1.1
+ListItemBase
 Base 0.1 1.0
 Empty
     property variant icon
@@ -353,7 +339,7 @@
 PickerDelegate 0.1 1.0
 AbstractButton
     readonly property Picker picker
-modules/Ubuntu/Components/Pickers/PickerPanel.qml
+PickerPanel 0.1 1.0
 Object
     function openDatePicker(caller, property, mode)
 ActionSelectionPopover 0.1 1.0
@@ -657,6 +643,32 @@
     property Item pageStack
     property bool opened
     property bool locked
+UbuntuColors 1.1
+QtObject
+    readonly property color orange
+    readonly property color lightAubergine
+    readonly property color midAubergine
+    readonly property color darkAubergine
+    readonly property color warmGrey
+    readonly property color coolGrey
+    property Gradient orangeGradient
+    property Gradient greyGradient
+    readonly property color lightGrey
+    readonly property color darkGrey
+    readonly property color red
+    readonly property color green
+    readonly property color blue
+    readonly property color purple
+UbuntuColors 0.1 1.0
+QtObject
+    readonly property color orange
+    readonly property color lightAubergine
+    readonly property color midAubergine
+    readonly property color darkAubergine
+    readonly property color warmGrey
+    readonly property color coolGrey
+    property Gradient orangeGradient
+    property Gradient greyGradient
 UbuntuListView 0.1 1.0
 ListView
     property int expandedIndex
@@ -804,6 +816,19 @@
     name: "UCInverseMouse"
     prototype: "UCMouse"
     exports: ["InverseMouse 0.1", "InverseMouse 1.0"]
+    name: "UCListItemBackground"
+    prototype: "QQuickItem"
+    Property { name: "color"; type: "QColor" }
+    Property { name: "pressedColor"; type: "QColor" }
+    name: "UCListItemBase"
+    prototype: "UCStyledItemBase"
+    exports: ["ListItemBase 1.1"]
+    Property { name: "background"; type: "UCListItemBackground"; isReadonly: true; isPointer: true }
+    Property { name: "pressed"; type: "bool"; isReadonly: true }
+    Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+    Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+    Property { name: "owningItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+    Signal { name: "clicked" }
     name: "UCMouse"
     prototype: "QObject"
     exports: ["Mouse 0.1", "Mouse 1.0"]
@@ -924,6 +949,17 @@
     Parameter { name: "singular"; type: "string" }
     Parameter { name: "plural"; type: "string" }
     Parameter { name: "n"; type: "int" }
+    prototype: "QObject"
+    name: "UbuntuColors"
+    exports: ["UbuntuColors -1.-1"]
+    Property { name: "orange"; type: "QColor"; isReadonly: true }
+    Property { name: "lightAubergine"; type: "QColor"; isReadonly: true }
+    Property { name: "midAubergine"; type: "QColor"; isReadonly: true }
+    Property { name: "darkAubergine"; type: "QColor"; isReadonly: true }
+    Property { name: "warmGrey"; type: "QColor"; isReadonly: true }
+    Property { name: "coolGrey"; type: "QColor"; isReadonly: true }
+    Property { name: "orangeGradient"; type: "QQuickGradient"; isPointer: true }
+    Property { name: "greyGradient"; type: "QQuickGradient"; isPointer: true }
     name: "ULConditionalLayout"
     prototype: "QObject"
     exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"]

=== modified file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-07-28 10:34:06 +0000
+++ debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-09-04 06:44:23 +0000
@@ -21,7 +21,6 @@
 usr/lib/*/qt5/qml/Ubuntu/Components/Popups/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Colors/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Test

=== renamed file 'modules/Ubuntu/Components/Colors/UbuntuColors10.qml' => 'modules/Ubuntu/Components/10/UbuntuColors10.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors10.qml	2014-07-01 20:52:48 +0000
+++ modules/Ubuntu/Components/10/UbuntuColors10.qml	2014-09-04 06:44:23 +0000
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+pragma Singleton
 import QtQuick 2.2
 
 /*!

=== renamed file 'modules/Ubuntu/Components/Colors/UbuntuColors.qml' => 'modules/Ubuntu/Components/11/UbuntuColors.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors.qml	2014-07-24 16:02:47 +0000
+++ modules/Ubuntu/Components/11/UbuntuColors.qml	2014-09-04 06:44:23 +0000
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+pragma Singleton
 import QtQuick 2.2
 
 /*!

=== removed directory 'modules/Ubuntu/Components/Colors'
=== removed file 'modules/Ubuntu/Components/Colors/Colors.pro'
--- modules/Ubuntu/Components/Colors/Colors.pro	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/Colors/Colors.pro	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-
-uri = Ubuntu.Components.Colors
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-
-qml_files.path = $$installPath
-qml_files.files = *.qml
-
-INSTALLS += qml_files

=== removed file 'modules/Ubuntu/Components/Colors/FIXME'
--- modules/Ubuntu/Components/Colors/FIXME	2014-07-01 20:52:48 +0000
+++ modules/Ubuntu/Components/Colors/FIXME	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-UbuntuColors.qml is located in the Colors subdirectory because
-QuickUtils::createQmlObject() fails if the QML file is located in a
-folder that has a qmldir file with JavaScript modules.
-
-UbuntuColors 1.1 is not in a file named UbuntuColors11.qml but in
-UbuntuColors.qml so that qdoc can properly detect the component
-name without a qmldir file.

=== modified file 'modules/Ubuntu/Components/Components.pro'
--- modules/Ubuntu/Components/Components.pro	2014-07-28 15:04:39 +0000
+++ modules/Ubuntu/Components/Components.pro	2014-09-04 06:44:23 +0000
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += plugin Themes Colors 10 11
+SUBDIRS += plugin Themes 10 11
 
 include(deployment.pri)

=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-08-11 15:21:14 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-09-04 06:44:23 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+pragma Singleton
 import QtQuick 2.0
 import QtQuick.Window 2.0
 import Ubuntu.Components 1.1

=== modified file 'modules/Ubuntu/Components/Pickers/qmldir'
--- modules/Ubuntu/Components/Pickers/qmldir	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/qmldir	2014-09-04 06:44:23 +0000
@@ -8,6 +8,7 @@
 internal MonthModel MonthModel.qml
 internal DayModel DayModel.qml
 internal PickerModelBase PickerModelBase.qml
+singleton PickerPanel 0.1 PickerPanel.qml
 
 #version 1.0
 Picker 1.0 Picker.qml
@@ -15,3 +16,4 @@
 Dialer 1.0 Dialer.qml
 DialerHand 1.0 DialerHand.qml
 DatePicker 1.0 DatePicker.qml
+singleton PickerPanel 1.0 PickerPanel.qml

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-08-20 13:03:13 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-09-04 06:44:23 +0000
@@ -50,22 +50,19 @@
 #include "ucinversemouse.h"
 #include "sortfiltermodel.h"
 #include "ucstyleditembase.h"
+#include "uclistitem.h"
+#include "uclistitem_p.h"
 
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdexcept>
 
+QUrl UbuntuComponentsPlugin::m_baseUrl = QUrl();
+
 /*
  * Type registration functions.
  */
 
-static QObject *registerPickerPanel(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(scriptEngine)
-    return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
-           "Ubuntu.Components", "Pickers/PickerPanel.qml");
-}
-
 static QObject *registerClipboard(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -93,45 +90,9 @@
     return uriHandler;
 }
 
-static QObject *registerUbuntuColors10(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(scriptEngine)
-    return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
-           "Ubuntu.Components", "Colors/UbuntuColors10.qml");
-}
-
-static QObject *registerUbuntuColors11(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(scriptEngine)
-    return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
-           "Ubuntu.Components", "Colors/UbuntuColors.qml");
-}
-
-QUrl UbuntuComponentsPlugin::baseUrl(const QStringList& importPathList, const char* uri)
-{
-    /* FIXME: remove when migrating to Qt 5.1 and use QQmlExtensionPlugin::baseUrl()
-       http://doc-snapshot.qt-project.org/qt5-stable/qtqml/qqmlextensionplugin.html#baseUrl
-    */
-    QString pluginRelativePath = QString::fromUtf8(uri).replace(".", "/").prepend("/").append("/");
-    QString pluginPath;
-    Q_FOREACH (QString importPath, importPathList) {
-        pluginPath = importPath.append(pluginRelativePath);
-        /* We verify that the directory ending in Ubuntu/Components contains the
-           file libUbuntuComponents.so therefore proving it's the right directory.
-
-           Ref.: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197293
-        */
-        if (QFile(pluginPath + "libUbuntuComponents.so").exists()) {
-            return QUrl::fromLocalFile(pluginPath);
-        }
-    }
-
-    return QUrl();
-}
-
-QObject *UbuntuComponentsPlugin::registerQmlSingletonType(QQmlEngine *engine, const char* uri, const char* qmlFile)
-{
-    QUrl url = baseUrl(engine->importPathList(), uri).resolved(QUrl::fromLocalFile(qmlFile));
+QObject *UbuntuComponentsPlugin::registerQmlSingletonType(QQmlEngine *engine, const char* qmlFile)
+{
+    QUrl url = m_baseUrl.resolved(QUrl::fromLocalFile(qmlFile));
     return QuickUtils::instance().createQmlObject(url, engine);
 }
 
@@ -163,7 +124,6 @@
 void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor)
 {
     qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItemBase");
-    qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors10);
     qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
     qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
     qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
@@ -184,8 +144,6 @@
     qmlRegisterSingletonType<UCUriHandler>(uri, major, minor, "UriHandler", registerUriHandler);
     qmlRegisterType<UCMouse>(uri, major, minor, "Mouse");
     qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
-    // register QML singletons
-    qmlRegisterSingletonType<QObject>(uri, major, minor, "PickerPanel", registerPickerPanel);
 }
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
@@ -195,7 +153,6 @@
     // register 0.1 for backward compatibility
     registerTypesToVersion(uri, 0, 1);
     registerTypesToVersion(uri, 1, 0);
-    qmlRegisterSingletonType<QObject>(uri, 1, 1, "UbuntuColors", registerUbuntuColors11);
 
     // register custom event
     ForwardedEvent::registerForwardedEvent();
@@ -208,10 +165,16 @@
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
     qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
     qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
+    // ListItem and related types
+    qmlRegisterType<UCListItem, 1>(uri, 1, 1, "ListItem");
+    qmlRegisterType<UCListItemBackground>();
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
+    // initialize baseURL
+    m_baseUrl = QUrl(baseUrl().toString() + '/');
+
     QQmlExtensionPlugin::initializeEngine(engine, uri);
     QQmlContext* context = engine->rootContext();
 

=== modified file 'modules/Ubuntu/Components/plugin/plugin.h'
--- modules/Ubuntu/Components/plugin/plugin.h	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/plugin.h	2014-09-04 06:44:23 +0000
@@ -32,14 +32,18 @@
 public:
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
-    static QUrl baseUrl(const QStringList& importPathList, const char* uri);
-    static QObject *registerQmlSingletonType(QQmlEngine *engine, const char* uri, const char* qmlFile);
+    static QObject *registerQmlSingletonType(QQmlEngine *engine, const char* qmlFile);
+    static const QUrl &pluginUrl()
+    {
+        return m_baseUrl;
+    }
 
 private Q_SLOTS:
     void registerWindowContextProperty();
     void setWindowContextProperty(QWindow* focusWindow);
 
 private:
+    static QUrl m_baseUrl;
     void registerTypesToVersion(const char *uri, int major, int minor);
 };
 #endif // UBUNTU_COMPONENTS_PLUGIN_H

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-09-02 09:39:09 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-09-04 06:44:23 +0000
@@ -65,7 +65,9 @@
     ucmouse.h \
     unixsignalhandler_p.h \
     ucstyleditembase.h \
-    ucstyleditembase_p.h
+    ucstyleditembase_p.h \
+    uclistitem.h \
+    uclistitem_p.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -99,7 +101,8 @@
     ucurihandler.cpp \
     ucmousefilters.cpp \
     unixsignalhandler_p.cpp \
-    ucstyleditembase.cpp
+    ucstyleditembase.cpp \
+    uclistitem.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp

=== added file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-04 06:44:23 +0000
@@ -0,0 +1,352 @@
+/*
+ * 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/>.
+ */
+
+#include "ucunits.h"
+#include "uctheme.h"
+#include "uclistitem.h"
+#include "uclistitem_p.h"
+#include <QtQml/QQmlInfo>
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickflickable_p.h>
+#include <QtQuick/private/qquickpositioners_p.h>
+
+QColor getPaletteColor(const char *profile, const char *color)
+{
+    QColor result;
+    QObject *palette = UCTheme::instance().palette();
+    if (palette) {
+        QObject *paletteProfile = palette->property(profile).value<QObject*>();
+        if (paletteProfile) {
+            result = paletteProfile->property(color).value<QColor>();
+        }
+    }
+    return result;
+}
+
+
+/******************************************************************************
+ * ListItemBackground
+ */
+UCListItemBackground::UCListItemBackground(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_color(Qt::transparent)
+    , m_pressedColor(Qt::yellow)
+    , m_item(0)
+{
+    setFlag(QQuickItem::ItemHasContents);
+    // catch theme palette changes
+    connect(&UCTheme::instance(), &UCTheme::paletteChanged, this, &UCListItemBackground::updateColors);
+    updateColors();
+}
+
+UCListItemBackground::~UCListItemBackground()
+{
+}
+
+void UCListItemBackground::setColor(const QColor &color)
+{
+    if (m_color == color) {
+        return;
+    }
+    m_color = color;
+    update();
+    Q_EMIT colorChanged();
+}
+
+void UCListItemBackground::setPressedColor(const QColor &color)
+{
+    if (m_pressedColor == color) {
+        return;
+    }
+    m_pressedColor = color;
+    // no more theme change watch
+    disconnect(&UCTheme::instance(), &UCTheme::paletteChanged, this, &UCListItemBackground::updateColors);
+    update();
+    Q_EMIT pressedColorChanged();
+}
+
+void UCListItemBackground::updateColors()
+{
+    m_pressedColor = getPaletteColor("selected", "background");
+    update();
+}
+
+
+void UCListItemBackground::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    if (change == ItemParentHasChanged) {
+        m_item = qobject_cast<UCListItem*>(data.item);
+    }
+    QQuickItem::itemChange(change, data);
+}
+
+QSGNode *UCListItemBackground::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+{
+    Q_UNUSED(data);
+
+    UCListItemPrivate *dd = UCListItemPrivate::get(m_item);
+    bool pressed = (dd && dd->pressed);
+    QColor color = pressed ? m_pressedColor : m_color;
+
+    if (width() <= 0 || height() <= 0 || (color.alpha() == 0)) {
+        delete oldNode;
+        return 0;
+    }
+    QSGRectangleNode *rectNode = static_cast<QSGRectangleNode *>(oldNode);
+    if (!rectNode) {
+        rectNode = QQuickItemPrivate::get(this)->sceneGraphContext()->createRectangleNode();
+    }
+    rectNode->setColor(color);
+    rectNode->setRect(boundingRect());
+    rectNode->update();
+    return rectNode;
+}
+
+
+UCListItemPrivate::UCListItemPrivate()
+    : UCStyledItemBasePrivate()
+    , pressed(false)
+    , background(new UCListItemBackground)
+{
+}
+UCListItemPrivate::~UCListItemPrivate()
+{
+}
+
+void UCListItemPrivate::init()
+{
+    Q_Q(UCListItem);
+    background->setObjectName("ListItemHolder");
+    QQml_setParent_noEvent(background, q);
+    background->setParentItem(q);
+    // content will be redirected to the background, therefore we must report
+    // children changes as it would come from the main component
+    QObject::connect(background, &UCListItemBackground::childrenChanged,
+                     q, &UCListItem::childrenChanged);
+    q->setFlag(QQuickItem::ItemHasContents);
+    // turn activeFocusOnPress on
+    activeFocusOnPress = true;
+    setFocusable();
+
+    // watch size change and set implicit size;
+    QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_updateSize()));
+    _q_updateSize();
+}
+
+void UCListItemPrivate::setFocusable()
+{
+    // alsways accept mouse events
+    Q_Q(UCListItem);
+    q->setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton);
+    q->setFiltersChildMouseEvents(true);
+}
+
+void UCListItemPrivate::_q_rebound()
+{
+    setPressed(false);
+    // disconnect the flickable
+    listenToRebind(false);
+}
+
+// called when units size changes
+void UCListItemPrivate::_q_updateSize()
+{
+    Q_Q(UCListItem);
+    QQuickItem *owner = flickable ? flickable : parentItem;
+    q->setImplicitWidth(owner ? owner->width() : UCUnits::instance().gu(40));
+    q->setImplicitHeight(UCUnits::instance().gu(6));
+}
+
+// set pressed flag and update background
+void UCListItemPrivate::setPressed(bool pressed)
+{
+    if (this->pressed != pressed) {
+        this->pressed = pressed;
+        background->update();
+        Q_Q(UCListItem);
+        Q_EMIT q->pressedChanged();
+    }
+}
+
+// connects/disconnects from the Flickable anchestor to get notified when to do rebound
+void UCListItemPrivate::listenToRebind(bool listen)
+{
+    if (flickable.isNull()) {
+        return;
+    }
+    if (listen) {
+        QObject::connect(flickable.data(), SIGNAL(movementStarted()), q_ptr, SLOT(_q_rebound()));
+    } else {
+        QObject::disconnect(flickable.data(), SIGNAL(movementStarted()), q_ptr, SLOT(_q_rebound()));
+    }
+}
+
+/*!
+ * \qmltype ListItem
+ * \instantiates UCListItem
+ * \inqmlmodule Ubuntu.Components 1.1
+ * \ingroup ubuntu
+ * \brief The ListItem element provides Ubuntu design standards for list or grid
+ * views.
+ *
+ * The component is dedicated to be used in designs with static or dynamic lists
+ * (i.e. list views where each item's layout differs or in lists where the content
+ * is determined by a given model, thus each element has the same layout). The
+ * element does not define any specific layout, components can be placed in any
+ * ways on it. However, when used in list views, the content must be carefully
+ * chosen to in order to keep the kinetic behavior and the highest FPS possible.
+ */
+
+/*!
+ * \qmlsignal ListItem::clicked()
+ *
+ * The signal is emitted when the component gets released while the \l pressed property
+ * is set. When used in Flickable, the signal is not emitted if when the Flickable gets
+ * moved.
+ */
+UCListItem::UCListItem(QQuickItem *parent)
+    : UCStyledItemBase(*(new UCListItemPrivate), parent)
+{
+    Q_D(UCListItem);
+    d->init();
+}
+
+UCListItem::~UCListItem()
+{
+}
+
+void UCListItem::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    UCStyledItemBase::itemChange(change, data);
+    if (change == ItemParentHasChanged) {
+        Q_D(UCListItem);
+        // make sure we are not connected to the previous Flickable
+        d->listenToRebind(false);
+        // check if we are in a positioner, and if that positioner is in a Flickable
+        QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(data.item);
+        if (positioner && positioner->parentItem()) {
+            d->flickable = qobject_cast<QQuickFlickable*>(positioner->parentItem()->parentItem());
+        } else if (data.item && data.item->parentItem()){
+            // check if we are in a Flickable then
+            d->flickable = qobject_cast<QQuickFlickable*>(data.item->parentItem());
+        }
+
+        if (d->flickable) {
+            // connect to flickable to get width changes
+            QObject::connect(d->flickable, SIGNAL(widthChanged()), this, SLOT(_q_updateSize()));
+        } else if (data.item) {
+            QObject::connect(data.item, SIGNAL(widthChanged()), this, SLOT(_q_updateSize()));
+        }
+
+        // update size
+        d->_q_updateSize();
+    }
+}
+
+void UCListItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    UCStyledItemBase::geometryChanged(newGeometry, oldGeometry);
+    // resize background item
+    Q_D(UCListItem);
+    QRectF rect(boundingRect());
+    d->background->setSize(rect.size());
+}
+void UCListItem::mousePressEvent(QMouseEvent *event)
+{
+    UCStyledItemBase::mousePressEvent(event);
+    Q_D(UCListItem);
+    if (!d->flickable.isNull() && d->flickable->isMoving()) {
+        // while moving, we cannot select any items
+        return;
+    }
+    d->setPressed(true);
+    // connect the Flickable to know when to rebound
+    d->listenToRebind(true);
+    // accept the event so we get the rest of the events as well
+    event->setAccepted(true);
+}
+
+void UCListItem::mouseReleaseEvent(QMouseEvent *event)
+{
+    Q_D(UCListItem);
+    // set released
+    if (d->pressed) {
+        Q_EMIT clicked();
+    }
+    // save pressed state as UCFocusScope resets it seemlessly
+    bool wasPressed = d->pressed;
+    UCStyledItemBase::mouseReleaseEvent(event);
+    d->pressed = wasPressed;
+    d->setPressed(false);
+}
+
+/*!
+ * \qmlpropertygroup ::ListItem::background
+ * \qmlproperty color ListItem::background.color
+ * \qmlproperty color ListItem::background.pressedColor
+ *
+ * background grouped property is an Item which holds the layout of the item, with
+ * abilities to show different colors when in normal state or when pressed. All
+ * properties from Item are accessible and can be used to control user defined
+ * actions or animations, with the exception of the followings:
+ * \list A
+ * \li do not alter x, y, width or height properties as those are controlled by the
+ *      item itself when leading or trailing options are revealed and will destroy
+ *      your logic
+ * \li never anchor left or right as it will block revealing the options.
+ * \endlist
+ */
+UCListItemBackground* UCListItem::background() const
+{
+    Q_D(const UCListItem);
+    return d->background;
+}
+
+/*!
+ * \qmlproperty bool ListItem::pressed
+ * True when the item is pressed. The items stays pressed when the mouse or touch
+ * is moved horizontally. When in Flickable (or ListView), the item gets un-pressed
+ * (false) when the mouse or touch is moved towards the vertical direction causing
+ * the flickable to move.
+ */
+bool UCListItem::pressed() const
+{
+    Q_D(const UCListItem);
+    return d->pressed;
+}
+
+/*!
+ * \qmlproperty list<Object> ListItem::data
+ * \default
+ * Overloaded default property containing all the children and resources.
+ */
+QQmlListProperty<QObject> UCListItem::data()
+{
+    Q_D(UCListItem);
+    return QQuickItemPrivate::get(d->background)->data();
+}
+
+/*!
+ * \qmlproperty list<Item> ListItem::children
+ * Overloaded default property containing all the visible children of the item.
+ */
+QQmlListProperty<QQuickItem> UCListItem::children()
+{
+    Q_D(UCListItem);
+    return QQuickItemPrivate::get(d->background)->children();
+}
+
+#include "moc_uclistitem.cpp"

=== added file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2014-09-04 06:44:23 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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/>.
+ */
+
+#ifndef UCLISTITEM_H
+#define UCLISTITEM_H
+
+#include <QtQuick/QQuickItem>
+#include "ucstyleditembase.h"
+
+class UCListItemBackground;
+class UCListItemPrivate;
+class UCListItem : public UCStyledItemBase
+{
+    Q_OBJECT
+    Q_PROPERTY(UCListItemBackground *background READ background CONSTANT)
+    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false)
+    Q_PROPERTY(QQmlListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
+    Q_CLASSINFO("DefaultProperty", "data")
+public:
+    explicit UCListItem(QQuickItem *parent = 0);
+    ~UCListItem();
+
+    UCListItemBackground *background() const;
+    bool pressed() const;
+
+protected:
+    void itemChange(ItemChange change, const ItemChangeData &data);
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+Q_SIGNALS:
+    void pressedChanged();
+    void childrenChanged();
+
+    void clicked();
+
+public Q_SLOTS:
+
+private:
+    Q_DECLARE_PRIVATE(UCListItem)
+    QQmlListProperty<QObject> data();
+    QQmlListProperty<QQuickItem> children();
+    Q_PRIVATE_SLOT(d_func(), void _q_rebound())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
+};
+
+#endif // UCLISTITEM_H

=== added file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-04 06:44:23 +0000
@@ -0,0 +1,87 @@
+/*
+ * 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/>.
+ */
+
+#ifndef UCVIEWITEM_P_H
+#define UCVIEWITEM_P_H
+
+#include "uclistitem.h"
+#include "ucstyleditembase_p.h"
+#include <QtCore/QPointer>
+
+class QQuickFlickable;
+class UCListItemBackground;
+class UCListItemPrivate : public UCStyledItemBasePrivate
+{
+    Q_DECLARE_PUBLIC(UCListItem)
+public:
+    UCListItemPrivate();
+    virtual ~UCListItemPrivate();
+    void init();
+
+    static inline UCListItemPrivate *get(UCListItem *that)
+    {
+        Q_ASSERT(that);
+        return that->d_func();
+    }
+
+    // override setFocusable()
+    void setFocusable();
+
+    void _q_rebound();
+    void _q_updateSize();
+    void setPressed(bool pressed);
+    void listenToRebind(bool listen);
+
+    bool pressed:1;
+    QPointer<QQuickFlickable> flickable;
+    UCListItemBackground *background;
+};
+
+class UCListItemBackground : public QQuickItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor color MEMBER m_color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(QColor pressedColor MEMBER m_pressedColor WRITE setPressedColor NOTIFY pressedColorChanged)
+public:
+    explicit UCListItemBackground(QQuickItem *parent = 0);
+    ~UCListItemBackground();
+
+    void setColor(const QColor &color);
+    void setPressedColor(const QColor &color);
+
+Q_SIGNALS:
+    void colorChanged();
+    void pressedColorChanged();
+
+protected:
+    void itemChange(ItemChange change, const ItemChangeData &data);
+    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
+
+private Q_SLOTS:
+    void updateColors();
+
+private:
+    QColor m_color;
+    QColor m_pressedColor;
+    UCListItem *m_item;
+    bool m_pressedColorChanged:1;
+};
+
+QColor getPaletteColor(const char *profile, const char *color);
+
+QML_DECLARE_TYPE(UCListItemBackground)
+
+#endif // UCVIEWITEM_P_H

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-08-19 13:04:26 +0000
+++ modules/Ubuntu/Components/qmldir	2014-09-04 06:44:23 +0000
@@ -44,6 +44,7 @@
 ColorUtils 0.1 colorUtils.js
 DateUtils 0.1 dateUtils.js
 UbuntuListView 0.1 UbuntuListView.qml
+singleton UbuntuColors 0.1 10/UbuntuColors10.qml
 
 internal TextCursor TextCursor.qml
 internal TextInputPopover TextInputPopover.qml
@@ -88,6 +89,7 @@
 ColorUtils 1.0 colorUtils.js
 DateUtils 1.0 dateUtils.js
 UbuntuListView 1.0 UbuntuListView.qml
+singleton UbuntuColors 1.0 10/UbuntuColors10.qml
 
 #version 1.1
 ComboButton 1.1 ComboButton.qml
@@ -103,3 +105,4 @@
 PageHeadState 1.1 PageHeadState.qml
 Icon 1.1 Icon11.qml
 StyledItem 1.1 StyledItem.qml
+singleton UbuntuColors 1.1 11/UbuntuColors.qml

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-07-29 16:13:32 +0000
+++ tests/qmlapicheck.py	2014-09-04 06:44:23 +0000
@@ -48,28 +48,32 @@
 classes = {}
 for line in fileinput.input():
     if fileinput.filename()[-6:] == 'qmldir':
+        if line == '\n' or line[:1] == '#':
+            # Comments
+            continue
         if line[:8] == 'internal':
             # Internal components are not part of public API
             continue
         pieces = line.strip().split(' ')
-        if len(pieces) > 2:
-            filename = pieces[2]
-            # We only work with QML
-            if filename[-3:] == 'qml':
-                # Filenames are relative to the qmldir
-                # Foo 1.0 Foo.qml
-                folder = os.path.dirname(fileinput.filename())
-                fullpath = folder + '/' + filename
-                classname = pieces[0]
-                version = pieces[1]
-                if fullpath not in inputfiles:
-                    inputfiles.append(fullpath)
-                    classes[fullpath] = [classname, version]
-                else:
-                    versions = classes[fullpath]
-                    if classname not in versions:
-                        versions.append(classname)
-                    versions.append(version)
+        # [singleton] Foo 1.0 Foo.qml
+        if pieces[0] == 'singleton':
+            pieces.pop(0)
+        if pieces[0].islower():
+            # Unknown keyword
+            continue
+        classname, version, filename = pieces
+        if filename[-3:] == 'qml':
+            # Filenames are relative to the qmldir
+            folder = os.path.dirname(fileinput.filename())
+            fullpath = folder + '/' + filename
+            if fullpath not in inputfiles:
+                inputfiles.append(fullpath)
+                classes[fullpath] = [classname, version]
+            else:
+                versions = classes[fullpath]
+                if classname not in versions:
+                    versions.append(classname)
+                versions.append(version)
     else:
         inputfiles.append(fileinput.filename())
         fileinput.nextfile()

=== modified file 'tests/qmlapicheck.sh'
--- tests/qmlapicheck.sh	2014-07-16 06:25:18 +0000
+++ tests/qmlapicheck.sh	2014-09-04 06:44:23 +0000
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ################################################################################
-QML="modules/Ubuntu/*/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/Components/Pickers/PickerPanel.qml"
+QML="modules/Ubuntu/*/qmldir modules/Ubuntu/Components/*/qmldir"
 CPP="Ubuntu.Components Ubuntu.Layouts Ubuntu.PerformanceMetrics Ubuntu.Test"
 
 echo Dumping QML API of C++ components

=== added directory 'tests/resources/listitems'
=== added file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/listitems/ListItemTest.qml	2014-09-04 06:44:23 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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.2
+import Ubuntu.Components 1.1
+
+MainView {
+    id: main
+    width: units.gu(50)
+    height: units.gu(100)
+
+    property bool override: false
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        ListItem {
+            id: testItem
+            background.color: "green"
+            onClicked: {
+                print("click")
+                main.override = !main.override
+            }
+            Rectangle {
+                anchors.fill: parent
+                color: "tan"
+            }
+        }
+
+        ListView {
+            id: view
+            clip: true
+            width: parent.width
+            height: units.gu(40)
+            model: 100
+            pressDelay: 0
+            delegate: ListItem {
+                id: listItem
+                onClicked: print(" clicked")
+                Label {
+                    text: modelData + " item"
+                }
+                states: State {
+                    name: "override"
+                    when: main.override
+                    PropertyChanges {
+                        target: listItem.background
+                        pressedColor: "brown"
+                    }
+                }
+            }
+        }
+        Flickable {
+            id: flicker
+            width: parent.width
+            height: units.gu(40)
+            clip: true
+            contentHeight: column.childrenRect.height
+            Column {
+                id: column
+                width: view.width
+                Repeater {
+                    model: 100
+                    ListItem {
+                        background {
+                            color: "red"
+                            pressedColor: "lime"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'tests/unit/tst_performance/ItemList.qml'
--- tests/unit/tst_performance/ItemList.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ItemList.qml	2014-09-04 06:44:23 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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 1.1
+
+Column {
+    width: 800
+    height: 600
+    Repeater {
+        model: 10000
+        Item {
+            width: parent.width
+            height: units.gu(6)
+        }
+    }
+}

=== added file 'tests/unit/tst_performance/ListItemList.qml'
--- tests/unit/tst_performance/ListItemList.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ListItemList.qml	2014-09-04 06:44:23 +0000
@@ -0,0 +1,28 @@
+/*
+ * 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 1.1
+
+Column {
+    width: 800
+    height: 600
+    Repeater {
+        model: 10000
+        ListItem {
+        }
+    }
+}

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2013-06-27 15:35:23 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2014-09-04 06:44:23 +0000
@@ -74,16 +74,10 @@
         QTest::newRow("grid with Label") << "LabelGrid.qml" << QUrl();
         QTest::newRow("grid with UbuntuShape") << "UbuntuShapeGrid.qml" << QUrl();
         QTest::newRow("grid with UbuntuShapePair") << "PairOfUbuntuShapeGrid.qml" << QUrl();
-        QTest::newRow("grid with ButtonStyle") << "ButtonStyleGrid.qml" << QUrl();
         QTest::newRow("grid with Button") << "ButtonGrid.qml" << QUrl();
-//        QTest::newRow("grid with CheckBoxStyle") << "CheckBoxStyleGrid.qml" << QUrl();
-//        QTest::newRow("grid with CheckBox") << "CheckBoxGrid.qml" << QUrl();
-//        QTest::newRow("grid with SwitchStyle") << "SwitchStyleGrid.qml" << QUrl();
-//        QTest::newRow("grid with Switch") << "SwitchGrid.qml" << QUrl();
-//        QTest::newRow("grid with SwitchStyle") << "SwitchStyleGrid.qml" << QUrl();
-//        QTest::newRow("grid with Switch") << "SwitchGrid.qml" << QUrl();
-        QTest::newRow("grid with SliderStyle") << "SliderStyleGrid.qml" << QUrl();
         QTest::newRow("grid with Slider") << "SliderGrid.qml" << QUrl();
+        QTest::newRow("list with Item") << "ItemList.qml" << QUrl();
+        QTest::newRow("list with ListItem") << "ListItemList.qml" << QUrl();
     }
 
     void benchmark_GridOfComponents()

=== modified file 'tests/unit/tst_performance/tst_performance.pro'
--- tests/unit/tst_performance/tst_performance.pro	2013-06-27 15:20:12 +0000
+++ tests/unit/tst_performance/tst_performance.pro	2014-09-04 06:44:23 +0000
@@ -19,4 +19,6 @@
     TextWithImport.qml \
     TextWithImportGrid.qml \
     TextWithImportPopupsGrid.qml \
-    TextWithImportPopups.qml
+    TextWithImportPopups.qml \
+    ItemList.qml \
+    ListItemList.qml

=== added file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2014-09-04 06:44:23 +0000
@@ -0,0 +1,149 @@
+/*
+ * 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 QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.1
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        width: parent.width
+        ListItem {
+            id: defaults
+            width: parent.width
+        }
+        ListItem {
+            id: testItem
+            width: parent.width
+            background.color: "blue"
+            Item {
+                id: contentItem
+                anchors.fill: parent
+            }
+        }
+        ListView {
+            id: listView
+            width: parent.width
+            height: units.gu(24)
+            clip: true
+            model: 10
+            delegate: ListItem {
+                objectName: "listItem" + index
+                width: parent.width
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "ListItemAPI"
+        when: windowShown
+
+        SignalSpy {
+            id: pressedSpy
+            signalName: "pressedChanged"
+            target: testItem
+        }
+
+        SignalSpy {
+            id: clickSpy
+            signalName: "clicked"
+            target: testItem;
+        }
+
+        function centerOf(item) {
+            return Qt.point(item.width / 2, item.height / 2);
+        }
+
+        function initTestCase() {
+            TestExtras.registerTouchDevice();
+        }
+
+        function cleanup() {
+            pressedSpy.clear();
+            clickSpy.clear();
+            // make sure all events are processed
+            wait(200);
+        }
+
+        function test_0_defaults() {
+            verify(defaults.background !== null, "Defaults is null");
+            compare(defaults.background.color, "#000000", "Transparent by default");
+            compare(defaults.background.pressedColor, Theme.palette.selected.background, "Theme.palette.selected.background color by default")
+            compare(defaults.pressed, false, "Not pressed buy default");
+        }
+
+        function test_children_in_background() {
+            compare(contentItem.parent, testItem.background, "Content is not in the right holder!");
+        }
+
+        function test_pressedChanged_on_click() {
+            mousePress(testItem, testItem.width / 2, testItem.height / 2);
+            pressedSpy.wait();
+            mouseRelease(testItem, testItem.width / 2, testItem.height / 2);
+        }
+        function test_pressedChanged_on_tap() {
+            TestExtras.touchPress(0, testItem, centerOf(testItem));
+            pressedSpy.wait();
+            TestExtras.touchRelease(0, testItem, centerOf(testItem));
+            // local cleanup, wait few msecs to suppress double tap
+            wait(400);
+        }
+
+        function test_clicked_on_mouse() {
+            mouseClick(testItem, testItem.width / 2, testItem.height / 2);
+            clickSpy.wait();
+        }
+        function test_clicked_on_tap() {
+            TestExtras.touchClick(0, testItem, centerOf(testItem));
+            clickSpy.wait();
+        }
+
+        function test_mouse_click_on_listitem() {
+            var listItem = findChild(listView, "listItem0");
+            verify(listItem, "Cannot find listItem0");
+
+            mousePress(listItem, listItem.width / 2, 0);
+            compare(listItem.pressed, true, "Item is not pressed?");
+            // do 5 moves to be able to sense it
+            var dy = 0;
+            for (var i = 1; i <= 5; i++) {
+                dy += i * 10;
+                mouseMove(listItem, listItem.width / 2, dy);
+            }
+            compare(listItem.pressed, false, "Item is pressed still!");
+            mouseRelease(listItem, listItem.width / 2, dy);
+        }
+        function test_touch_click_on_listitem() {
+            var listItem = findChild(listView, "listItem0");
+            verify(listItem, "Cannot find listItem0");
+
+            TestExtras.touchPress(0, listItem, Qt.point(listItem.width / 2, 5));
+            compare(listItem.pressed, true, "Item is not pressed?");
+            // do 5 moves to be able to sense it
+            var dy = 0;
+            for (var i = 1; i <= 5; i++) {
+                dy += i * 10;
+                TestExtras.touchMove(0, listItem, Qt.point(listItem.width / 2, dy));
+            }
+            compare(listItem.pressed, false, "Item is pressed still!");
+            TestExtras.touchRelease(0, listItem, Qt.point(listItem.width / 2, dy));
+        }
+    }
+}