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

[Zsombor Egri]

Boosting ListItem performance by removing the workaround brought in for 1.3 specific API.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1648
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2286/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1016
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1016/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1013

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

I am happy. and I am sad. for we can have theme versions without classes. but no longer is there a version for the attached properties in these cases.

The performance impact is a terrifying argument. I accept the trade-in given those numbers.

For the record, as the question came up in IRC, it's correct that the ListItem's merge in the components.api because it is indeed identical. The expansion property shows 1.3 so we know it's going to be inaccessible for 1.2 imports.

The merger is pretty straight-forward, and looks correct to me. There does seem to be an issue with the button handling judging by the failures on J... I'm not spotting it the way I'm reading the code, though. My guess would be that some code path is executed that used to be skipped conditional to the context menu.

review: Approve

[lp:~zsombi/ubuntu-ui-toolkit/listitem_slowdown]

1649. By Zsombor Egri on 2015-09-28

version detection

1650. By Zsombor Egri on 2015-09-28

staging sync

1651. By Zsombor Egri on 2015-09-28

regain ListItem speed by not using unique connection for expansion tracking

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1650
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2315/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1045
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1045/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1042

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1651
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2316/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1046
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1046/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1043

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-09-24 20:03:02 +0000
+++ components.api	2015-09-28 07:37:49 +0000
@@ -503,7 +503,7 @@
 Ubuntu.Layouts.Layouts 1.0 0.1: Item
     readonly property string currentLayout
     readonly property ConditionalLayout layouts
-Ubuntu.Components.ListItem 1.2: StyledItem
+Ubuntu.Components.ListItem 1.3 1.2: StyledItem
     property Action action
     property color color
     readonly property Item contentItem
@@ -511,6 +511,7 @@
     readonly property UCListItemDivider divider
     property bool dragMode
     readonly property bool dragging
+    readonly property UCListItemExpansion expansion 1.3
     property color highlightColor
     readonly property bool highlighted
     property ListItemActions leadingActions
@@ -523,8 +524,6 @@
     property bool selectMode
     property bool selected
     property ListItemActions trailingActions
-Ubuntu.Components.ListItem 1.3: ListItem
-    readonly property UCListItemExpansion expansion
 Ubuntu.Components.ListItemActions 1.2: QtObject
     readonly property Action actions
     default readonly property QtObject data
@@ -1506,13 +1505,12 @@
     property var values
 Ubuntu.Components.ViewItems 1.2: QtObject
     property bool dragMode
-    signal dragUpdated(ListItemDrag event)
-    property bool selectMode
-    property QList<int> selectedIndices
-Ubuntu.Components.ViewItems 1.3: ViewItems
     property QList<int> expandedIndices
     property int expansionFlags
+    signal dragUpdated(ListItemDrag event)
     signal expandedIndicesChanged(QList<int> indices)
+    property bool selectMode
+    property QList<int> selectedIndices
 Ubuntu.Components.ViewItems.ExpansionFlag: Enum
     CollapseOnOutsidePress
     Exclusive

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-09-24 05:10:12 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-09-28 07:37:49 +0000
@@ -229,9 +229,8 @@
 
     // register 1.3 API
     qmlRegisterType<UCItemAttached>();
-    qmlRegisterType<UCListItem13>(uri, 1, 3, "ListItem");
+    qmlRegisterType<UCListItem, 1>(uri, 1, 3, "ListItem");
     qmlRegisterType<UCListItemExpansion>();
-    qmlRegisterUncreatableType<UCViewItemsAttached13>(uri, 1, 3, "ViewItems", "No create");
     qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
     qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
     qmlRegisterSingletonType<UCNamespaceV13>(uri, 1, 3, "Ubuntu", registerUbuntuNamespace13);

=== modified file 'src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp	2015-09-04 09:32:31 +0000
+++ src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp	2015-09-28 07:37:49 +0000
@@ -19,7 +19,7 @@
 
 UCListItemExpansion::UCListItemExpansion(QObject *parent)
     : QObject(parent)
-    , m_listItem(static_cast<UCListItem13*>(parent))
+    , m_listItem(static_cast<UCListItem*>(parent))
     , m_height(0.0)
     , m_filtering(false)
 {

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-09-18 10:49:07 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2015-09-28 07:37:49 +0000
@@ -184,23 +184,22 @@
  */
 UCListItemPrivate::UCListItemPrivate()
     : UCStyledItemBasePrivate()
-    , defaultThemeVersion(0)
+    , color(Qt::transparent)
+    , highlightColor(Qt::transparent)
+    , contentItem(new QQuickItem)
+    , divider(new UCListItemDivider)
+    , leadingActions(Q_NULLPTR)
+    , trailingActions(Q_NULLPTR)
+    , mainAction(Q_NULLPTR)
+    , expansion(Q_NULLPTR)
+    , xAxisMoveThresholdGU(DEFAULT_SWIPE_THRESHOLD_GU)
+    , button(Qt::NoButton)
     , highlighted(false)
     , contentMoved(false)
     , swiped(false)
     , suppressClick(false)
     , ready(false)
     , customColor(false)
-    , xAxisMoveThresholdGU(DEFAULT_SWIPE_THRESHOLD_GU)
-    , color(Qt::transparent)
-    , highlightColor(Qt::transparent)
-    , parentAttached(0)
-    , contentItem(new QQuickItem)
-    , divider(new UCListItemDivider)
-    , leadingActions(0)
-    , trailingActions(0)
-    , mainAction(0)
-    , expansion(Q_NULLPTR)
 {
 }
 UCListItemPrivate::~UCListItemPrivate()
@@ -965,7 +964,6 @@
 {
     Q_D(UCListItem);
     d->init();
-    d->defaultThemeVersion = BUILD_VERSION(1, 2);
 }
 
 UCListItem::~UCListItem()
@@ -981,11 +979,6 @@
 {
     UCStyledItemBase::classBegin();
     Q_D(UCListItem);
-    // initialize theme
-    UCTheme *theme = d->getTheme();
-    if (theme == &UCTheme::defaultTheme()) {
-        theme->setVersion(d->defaultThemeVersion);
-    }
     d->_q_themeChanged();
     d->divider->paletteChanged();
 }
@@ -1075,6 +1068,11 @@
             myStyle->updateFlickable(d->flickable);
         }
 
+        if (d->parentAttached) {
+            connect(d->parentAttached.data(), SIGNAL(expandedIndicesChanged(QList<int>)),
+                    this, SLOT(_q_updateExpansion(QList<int>)), Qt::DirectConnection);
+        }
+
         if (parentAttachee) {
             QObject::connect(parentAttachee, SIGNAL(widthChanged()), this, SLOT(_q_updateSize()), Qt::DirectConnection);
             // update size
@@ -1156,52 +1154,55 @@
     if (d->canHighlight() && !d->highlighted && event->button() == Qt::LeftButton) {
         d->handleLeftButtonPress(event);
     }
+    if (d->shouldShowContextMenu(event)) {
+        d->showContextMenu();
+    }
 }
 
-bool UCListItem13::shouldShowContextMenu(QMouseEvent *event)
+bool UCListItemPrivate::shouldShowContextMenu(QMouseEvent *event)
 {
     if (event->button() != Qt::RightButton)
         return false;
-    return leadingActions() || trailingActions();
-}
-
-void UCListItem13::mousePressEvent(QMouseEvent *event)
-{
-    UCListItem::mousePressEvent(event);
-    if (shouldShowContextMenu(event)) {
-        Q_D(UCListItem);
-
-        // Highlight the Item while the menu is showing
-        d->setHighlighted(true);
-        // Reset the timer which otherwise is started with highlighting
-        d->pressAndHoldTimer.stop();
-
-        quint16 version(d->getTheme()->version());
-        QString versionString(QStringLiteral("%1.%2").arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version)));
-        QUrl url(UbuntuComponentsPlugin::pluginUrl().resolved(versionString + "/ListItemPopover.qml"));
-
-        // Open Popover
-        QQmlEngine* engine = qmlEngine(this);
-        QQmlComponent* component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, this);
-        if (component->isError()) {
-            qmlInfo(this) << component->errorString();
-        } else {
-            QQmlEngine::setContextForObject(component, qmlContext(this));
-            QQuickItem* item = static_cast<QQuickItem*>(component->create(qmlContext(this)));
-            item->setProperty("caller", QVariant::fromValue(this));
-            item->setParentItem(QuickUtils::instance().rootItem(this));
-            QMetaObject::invokeMethod(item, "show");
-            connect(item, &QQuickItem::visibleChanged, this,
-                &UCListItem13::popoverClosed, Qt::DirectConnection);
-        }
-        delete component;
-    }
-}
-
-void UCListItem13::popoverClosed()
-{
-    Q_D(UCListItem);
-    d->setHighlighted(false);
+    return leadingActions || trailingActions;
+}
+
+void UCListItemPrivate::_q_popoverClosed()
+{
+    setHighlighted(false);
+}
+
+void UCListItemPrivate::showContextMenu()
+{
+    Q_Q(UCListItem);
+    // themes 1.2 and below should not have context menu support, so leave
+    quint16 version(getTheme()->version());
+    if (version <= BUILD_VERSION(1, 2)) {
+        return;
+    }
+
+    // Highlight the Item while the menu is showing
+    setHighlighted(true);
+    // Reset the timer which otherwise is started with highlighting
+    pressAndHoldTimer.stop();
+
+    QString versionString(QStringLiteral("%1.%2").arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version)));
+    QUrl url(UbuntuComponentsPlugin::pluginUrl().resolved(versionString + "/ListItemPopover.qml"));
+
+    // Open Popover
+    QQmlEngine* engine = qmlEngine(q);
+    QQmlComponent* component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, q);
+    if (component->isError()) {
+        qmlInfo(q) << component->errorString();
+    } else {
+        QQmlEngine::setContextForObject(component, qmlContext(q));
+        QQuickItem* item = static_cast<QQuickItem*>(component->create(qmlContext(q)));
+        item->setProperty("caller", QVariant::fromValue(q));
+        item->setParentItem(QuickUtils::instance().rootItem(q));
+        QMetaObject::invokeMethod(item, "show");
+        QObject::connect(item, SIGNAL(visibleChanged()), q,
+            SLOT(_q_popoverClosed()), Qt::DirectConnection);
+    }
+    delete component;
 }
 
 // ungrabs any previously grabbed left mouse button event
@@ -1239,17 +1240,15 @@
 
 void UCListItem::mouseReleaseEvent(QMouseEvent *event)
 {
+    Q_D(UCListItem);
+    if (d->shouldShowContextMenu(event)) {
+        return;
+    }
+
     UCStyledItemBase::mouseReleaseEvent(event);
-    Q_D(UCListItem);
     d->handleLeftButtonRelease(event);
 }
 
-void UCListItem13::mouseReleaseEvent(QMouseEvent *event)
-{
-    if (!shouldShowContextMenu(event))
-        UCListItem::mouseReleaseEvent(event);
-}
-
 // returns true if the mouse is swiped over the threshold value
 bool UCListItemPrivate::swipedOverThreshold(const QPointF &mousePos, const QPointF relativePos)
 {
@@ -1769,33 +1768,6 @@
     return QQuickItemPrivate::get(contentItem)->children();
 }
 
-/******************************************************************************
- * Versioning
- */
-UCListItem13::UCListItem13(QQuickItem *parent)
-    : UCListItem(parent)
-{
-    Q_D(UCListItem);
-    d->defaultThemeVersion = BUILD_VERSION(1, 3);
-}
-
-QObject *UCListItem13::attachedViewItems(QObject *object, bool create)
-{
-    return qmlAttachedPropertiesObject<UCViewItemsAttached13>(object, create);
-}
-
-void UCListItem13::itemChange(ItemChange change, const ItemChangeData &data)
-{
-    UCListItem::itemChange(change, data);
-
-    Q_D(UCListItem);
-    // ViewItems drives expansion
-    if (d->parentAttached) {
-        connect(d->parentAttached.data(), SIGNAL(expandedIndicesChanged(QList<int>)),
-                this, SLOT(_q_updateExpansion(QList<int>)), Qt::UniqueConnection);
-    }
-}
-
 /*!
  * \qmlpropertygroup ::ListItem::expansion
  * \qmlproperty bool ListItem::expansion.expanded
@@ -1803,7 +1775,7 @@
  * \since Ubuntu.Components 1.3
  * The group drefines the expansion state of the ListItem.
  */
-UCListItemExpansion *UCListItem13::expansion()
+UCListItemExpansion *UCListItem::expansion()
 {
     Q_D(UCListItem);
     if (!d->expansion) {
@@ -1812,14 +1784,13 @@
     return d->expansion;
 }
 
-void UCListItem13::_q_updateExpansion(const QList<int> &indices)
+void UCListItemPrivate::_q_updateExpansion(const QList<int> &indices)
 {
-    Q_UNUSED(indices);
-    Q_D(UCListItem);
-    Q_EMIT expansion()->expandedChanged();
+    Q_Q(UCListItem);
+    Q_EMIT q->expansion()->expandedChanged();
     // make sure the style is loaded
-    if (indices.contains(d->index())) {
-        d->loadStyleItem();
+    if (indices.contains(index())) {
+        loadStyleItem();
     }
 }
 

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.h'
--- src/Ubuntu/Components/plugin/uclistitem.h	2015-09-17 06:29:36 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.h	2015-09-28 07:37:49 +0000
@@ -25,6 +25,7 @@
 class UCListItemActions;
 class UCAction;
 class UCListItemPrivate;
+class UCListItemExpansion;
 class UCListItem : public UCStyledItemBase
 {
     Q_OBJECT
@@ -44,6 +45,8 @@
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QObject> listItemData READ data DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QQuickItem> listItemChildren READ children NOTIFY listItemChildrenChanged DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "listItemData")
+    // 1.3
+    Q_PROPERTY(UCListItemExpansion* expansion READ expansion CONSTANT REVISION 1)
 public:
     explicit UCListItem(QQuickItem *parent = 0);
     ~UCListItem();
@@ -60,6 +63,8 @@
     QColor highlightColor() const;
     void setHighlightColor(const QColor &color);
     void resetHighlightColor();
+    // 1.3
+    UCListItemExpansion *expansion();
 
 protected:
     virtual QObject *attachedViewItems(QObject *object, bool create);
@@ -108,26 +113,8 @@
     Q_PRIVATE_SLOT(d_func(), void _q_contentMoving())
     Q_PRIVATE_SLOT(d_func(), void _q_syncSelectMode())
     Q_PRIVATE_SLOT(d_func(), void _q_syncDragMode())
-};
-
-class UCListItemExpansion;
-class UCListItem13 : public UCListItem
-{
-    Q_OBJECT
-    Q_PROPERTY(UCListItemExpansion* expansion READ expansion CONSTANT)
-protected:
-    virtual QObject *attachedViewItems(QObject *object, bool create);
-    void itemChange(ItemChange change, const ItemChangeData &data);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-private:
-    Q_SLOT void _q_updateExpansion(const QList<int> &indices);
-    bool shouldShowContextMenu(QMouseEvent *event);
-    void popoverClosed();
-public:
-    explicit UCListItem13(QQuickItem *parent = 0);
-
-    UCListItemExpansion *expansion();
+    Q_PRIVATE_SLOT(d_func(), void _q_updateExpansion(const QList<int> &indices))
+    Q_PRIVATE_SLOT(d_func(), void _q_popoverClosed())
 };
 
 class UCListItemDividerPrivate;
@@ -167,6 +154,10 @@
     Q_PROPERTY(QList<int> selectedIndices READ selectedIndices WRITE setSelectedIndices NOTIFY selectedIndicesChanged)
     Q_PROPERTY(bool dragMode READ dragMode WRITE setDragMode NOTIFY dragModeChanged)
     Q_ENUMS(ExpansionFlag)
+    // FIXME these should be revisioned, however bug doesn't allow us to do that
+    // https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1389721
+    Q_PROPERTY(QList<int> expandedIndices READ expandedIndices WRITE setExpandedIndices NOTIFY expandedIndicesChanged)
+    Q_PROPERTY(int expansionFlags READ expansionFlags WRITE setExpansionFlags NOTIFY expansionFlagsChanged)
 public:
     enum ExpansionFlag {
         Exclusive = 0x01,
@@ -191,6 +182,12 @@
     bool dragMode() const;
     void setDragMode(bool value);
 
+    // 1.3
+    QList<int> expandedIndices() const;
+    void setExpandedIndices(QList<int> indices);
+    int expansionFlags() const;
+    void setExpansionFlags(int flags);
+
 private Q_SLOTS:
     void unbindItem();
     void completed();
@@ -202,39 +199,15 @@
 
     void dragUpdated(UCDragEvent *event);
 
+    // 1.3
+    void expandedIndicesChanged(const QList<int> &indices);
+    void expansionFlagsChanged();
 private:
     Q_DECLARE_PRIVATE(UCViewItemsAttached)
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(UCViewItemsAttached::ExpansionFlags)
 QML_DECLARE_TYPEINFO(UCViewItemsAttached, QML_HAS_ATTACHED_PROPERTIES)
 
-// FIXME keep the 1.3 properties in a separate class, workaround for bug
-// https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1389721
-// enums and flag are added to UCViewItemsAttached like normal
-class UCViewItemsAttached13 : public UCViewItemsAttached
-{
-    Q_OBJECT
-    Q_PROPERTY(QList<int> expandedIndices READ expandedIndices WRITE setExpandedIndices NOTIFY expandedIndicesChanged)
-    Q_PROPERTY(int expansionFlags READ expansionFlags WRITE setExpansionFlags NOTIFY expansionFlagsChanged)
-public:
-    explicit UCViewItemsAttached13(QObject *owner = 0);
-    static UCViewItemsAttached13 *qmlAttachedProperties(QObject *owner);
-
-    QList<int> expandedIndices() const;
-    void setExpandedIndices(QList<int> indices);
-    int expansionFlags() const;
-    void setExpansionFlags(int flags);
-
-Q_SIGNALS:
-    void expandedIndicesChanged(const QList<int> &indices);
-    void expansionFlagsChanged();
-
-private:
-    UCViewItemsAttachedPrivate *d_ptr;
-    Q_DECLARE_PRIVATE_D(d_ptr, UCViewItemsAttached)
-};
-QML_DECLARE_TYPEINFO(UCViewItemsAttached13, QML_HAS_ATTACHED_PROPERTIES)
-
 class UCListItemExpansion : public QObject
 {
     Q_OBJECT
@@ -258,12 +231,11 @@
     bool eventFilter(QObject *, QEvent *);
 
 private:
-    UCListItem13 *m_listItem;
+    UCListItem *m_listItem;
     qreal m_height;
     bool m_filtering:1;
 
     friend class UCListItem;
-    friend class UCListItem13;
     friend class UCListItemPrivate;
 };
 

=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
--- src/Ubuntu/Components/plugin/uclistitem_p.h	2015-09-17 08:05:07 +0000
+++ src/Ubuntu/Components/plugin/uclistitem_p.h	2015-09-28 07:37:49 +0000
@@ -59,6 +59,7 @@
     void _q_contentMoving();
     void _q_syncSelectMode();
     void _q_syncDragMode();
+    void _q_updateExpansion(const QList<int> &indices);
     int index();
     bool canHighlight();
     void setHighlighted(bool pressed);
@@ -71,32 +72,34 @@
     void handleLeftButtonPress(QMouseEvent *event);
     void handleLeftButtonRelease(QMouseEvent *event);
     bool sendMouseEvent(QQuickItem *item, QMouseEvent *event);
+    bool shouldShowContextMenu(QMouseEvent *event);
+    void _q_popoverClosed();
+    void showContextMenu();
 
-    quint16 defaultThemeVersion;
-    bool highlighted:1;
-    bool contentMoved:1;
-    bool swiped:1;
-    bool suppressClick:1;
-    bool ready:1;
-    bool customColor:1;
-    Qt::MouseButton button;
-    qreal xAxisMoveThresholdGU;
+    QPointer<QQuickItem> countOwner;
+    QPointer<QQuickFlickable> flickable;
+    QPointer<UCViewItemsAttached> parentAttached;
+    QPointer<ListItemDragHandler> dragHandler;
     QBasicTimer pressAndHoldTimer;
     QPointF lastPos;
     QPointF pressedPos;
     QPointF zeroPos;
     QColor color;
     QColor highlightColor;
-    QPointer<QQuickItem> countOwner;
-    QPointer<QQuickFlickable> flickable;
-    QPointer<UCViewItemsAttached> parentAttached;
-    QPointer<ListItemDragHandler> dragHandler;
     QQuickItem *contentItem;
     UCListItemDivider *divider;
     UCListItemActions *leadingActions;
     UCListItemActions *trailingActions;
     UCAction *mainAction;
     UCListItemExpansion *expansion;
+    qreal xAxisMoveThresholdGU;
+    Qt::MouseButton button;
+    bool highlighted:1;
+    bool contentMoved:1;
+    bool swiped:1;
+    bool suppressClick:1;
+    bool ready:1;
+    bool customColor:1;
 
     // getters/setters
     QQmlListProperty<QObject> data();
@@ -148,13 +151,13 @@
     void updateSelectedIndices(int fromIndex, int toIndex);
 
     // expansion
-    void expand(int index, UCListItem13 *listItem, bool emitChangeSignal = true);
+    void expand(int index, UCListItem *listItem, bool emitChangeSignal = true);
     void collapse(int index, bool emitChangeSignal = true);
     void collapseAll();
     void toggleExpansionFlags(bool enable);
 
     QSet<int> selectedList;
-    QMap<int, QPointer<UCListItem13> > expansionList;
+    QMap<int, QPointer<UCListItem> > expansionList;
     QList< QPointer<QQuickFlickable> > flickables;
     QPointer<UCListItem> boundItem;
     QQuickFlickable *listView;

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-09-21 14:24:05 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-09-28 07:37:49 +0000
@@ -21,6 +21,7 @@
 #include "uctheme.h"
 #include "ucstylehints.h"
 #include "ucthemingextension.h"
+#include "ucnamespace.h"
 #include <QtQml/QQmlEngine>
 #include <QtQuick/private/qquickanchors_p.h>
 
@@ -465,6 +466,20 @@
 {
     QQuickItem::componentComplete();
     Q_D(UCStyledItemBase);
+
+    QQmlData *data = QQmlData::get(this);
+    QQmlContextData *cdata = QQmlContextData::get(qmlContext(this));
+    QQmlPropertyData l;
+    QQmlPropertyData *pdata = QQmlPropertyCache::property(qmlEngine(this), this, QStringLiteral("theme"), cdata, l);
+    // FIXME MainView internal styler uses theme property, meaning imports13 will be true,
+    // therefore we must check the type of the property as well in case anyone else overrides it
+    bool imports13 = data->propertyCache->isAllowedInRevision(pdata) && (property("theme").type() != QVariant::String);
+    if (!imports13) {
+        // load 1.2 theme
+        UCTheme *theme = d->getTheme();
+        // FIXME: override the global theme version to be used when creating new themes!
+        theme->setVersion(BUILD_VERSION(1, 2));
+    }
     // no animation at this time
     // prepare style context if not been done yet
     d->postStyleChanged();

=== modified file 'src/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-09-17 06:29:36 +0000
+++ src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-09-28 07:37:49 +0000
@@ -549,18 +549,6 @@
     }
 }
 
-
-UCViewItemsAttached13::UCViewItemsAttached13(QObject *owner)
-    : UCViewItemsAttached(owner)
-{
-    d_ptr = UCViewItemsAttachedPrivate::get(this);
-}
-
-UCViewItemsAttached13 *UCViewItemsAttached13::qmlAttachedProperties(QObject *owner)
-{
-    return new UCViewItemsAttached13(owner);
-}
-
 /*!
  * \qmlattachedproperty list<int> ViewItems::expandedIndices
  * \since Ubuntu.Components 1.3
@@ -572,12 +560,12 @@
  * flags set, only the last item from the list will be considered and set as
  * expanded.
  */
-QList<int> UCViewItemsAttached13::expandedIndices() const
+QList<int> UCViewItemsAttached::expandedIndices() const
 {
     Q_D(const UCViewItemsAttached);
     return d->expansionList.keys();
 }
-void UCViewItemsAttached13::setExpandedIndices(QList<int> indices)
+void UCViewItemsAttached::setExpandedIndices(QList<int> indices)
 {
     Q_UNUSED(indices);
     Q_D(UCViewItemsAttached);
@@ -585,10 +573,10 @@
     if (indices.size() > 0) {
         if (d->expansionFlags & UCViewItemsAttached::Exclusive) {
             // take only the last one from the list
-            d->expand(indices.last(), QPointer<UCListItem13>(), false);
+            d->expand(indices.last(), QPointer<UCListItem>(), false);
         } else {
             for (int i = 0; i < indices.size(); i++) {
-                d->expand(indices[i], QPointer<UCListItem13>(), false);
+                d->expand(indices[i], QPointer<UCListItem>(), false);
             }
         }
     }
@@ -596,27 +584,27 @@
 }
 
 // insert listItem into the expanded indices map
-void UCViewItemsAttachedPrivate::expand(int index, UCListItem13 *listItem, bool emitChangeSignal)
+void UCViewItemsAttachedPrivate::expand(int index, UCListItem *listItem, bool emitChangeSignal)
 {
-    expansionList.insert(index, QPointer<UCListItem13>(listItem));
+    expansionList.insert(index, QPointer<UCListItem>(listItem));
     if (listItem && ((expansionFlags & UCViewItemsAttached::CollapseOnOutsidePress) == UCViewItemsAttached::CollapseOnOutsidePress)) {
         listItem->expansion()->enableClickFiltering(true);
     }
     if (emitChangeSignal) {
-        Q_EMIT static_cast<UCViewItemsAttached13*>(q_func())->expandedIndicesChanged(expansionList.keys());
+        Q_EMIT static_cast<UCViewItemsAttached*>(q_func())->expandedIndicesChanged(expansionList.keys());
     }
 }
 
 // collapse the item at index
 void UCViewItemsAttachedPrivate::collapse(int index, bool emitChangeSignal)
 {
-    UCListItem13 *item = expansionList.take(index).data();
+    UCListItem *item = expansionList.take(index).data();
     bool wasExpanded = item && item->expansion()->expanded();
     if (item && ((expansionFlags & UCViewItemsAttached::CollapseOnOutsidePress) == UCViewItemsAttached::CollapseOnOutsidePress)) {
         item->expansion()->enableClickFiltering(false);
     }
     if (emitChangeSignal && wasExpanded) {
-        Q_EMIT static_cast<UCViewItemsAttached13*>(q_func())->expandedIndicesChanged(expansionList.keys());
+        Q_EMIT static_cast<UCViewItemsAttached*>(q_func())->expandedIndicesChanged(expansionList.keys());
     }
 }
 
@@ -627,7 +615,7 @@
         collapse(expansionList.keys().last(), false);
     }
     if (emitChangedSignal) {
-        Q_EMIT static_cast<UCViewItemsAttached13*>(q_func())->expandedIndicesChanged(expansionList.keys());
+        Q_EMIT static_cast<UCViewItemsAttached*>(q_func())->expandedIndicesChanged(expansionList.keys());
     }
 }
 
@@ -651,12 +639,12 @@
  *      outside of its area. The flag also turns \c ViewItems.Exclusive flag on.
  * \endtable
  */
-int UCViewItemsAttached13::expansionFlags() const
+int UCViewItemsAttached::expansionFlags() const
 {
     Q_D(const UCViewItemsAttached);
     return d->expansionFlags;
 }
-void UCViewItemsAttached13::setExpansionFlags(int flags)
+void UCViewItemsAttached::setExpansionFlags(int flags)
 {
     Q_D(UCViewItemsAttached);
     if (d->expansionFlags == (ExpansionFlags)flags) {
@@ -677,9 +665,9 @@
     if (!hasClickOutsideFlag) {
         return;
     }
-    QMapIterator<int, QPointer<UCListItem13> > i(expansionList);
+    QMapIterator<int, QPointer<UCListItem> > i(expansionList);
     while (i.hasNext()) {
-        UCListItem13 *item = i.next().value().data();
+        UCListItem *item = i.next().value().data();
         // using expansion getter we will get the group created
         if (item && item->expansion()) {
             UCListItemPrivate *listItem = UCListItemPrivate::get(item);

=== added file 'tests/unit/tst_performance/ListItemList13.qml'
--- tests/unit/tst_performance/ListItemList13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ListItemList13.qml	2015-09-28 07:37:49 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.3
+
+Column {
+    width: 800
+    height: 600
+    property alias count: repeater.count
+    Repeater {
+        id: repeater
+        model: 5000
+        ListItem {
+        }
+    }
+}

=== added file 'tests/unit/tst_performance/ListOfCaptions13.qml'
--- tests/unit/tst_performance/ListOfCaptions13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ListOfCaptions13.qml	2015-09-28 07:37:49 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.3
+import QtQuick.Layouts 1.1
+
+Column {
+    width: 800
+    height: 600
+    Repeater {
+        id: repeater
+        model: 5000
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/unit/tst_performance/StyledItemNewTheming.qml'
--- tests/unit/tst_performance/StyledItemNewTheming.qml	2015-04-01 08:33:53 +0000
+++ tests/unit/tst_performance/StyledItemNewTheming.qml	2015-09-28 07:37:49 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 StyledItem {
     id: component1

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-09-22 14:39:47 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2015-09-28 07:37:49 +0000
@@ -114,9 +114,11 @@
         QTest::newRow("grid with Slider") << "SliderGrid.qml" << QUrl();
         QTest::newRow("list with QtQuick Item") << "ItemList.qml" << QUrl();
         QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl();
+        QTest::newRow("list with new ListItem 1.3") << "ListItemList13.qml" << QUrl();
         QTest::newRow("list with new ListItem with actions") << "ListItemWithActionsList.qml" << QUrl();
         QTest::newRow("list with new ListItem with inline actions") << "ListItemWithInlineActionsList.qml" << QUrl();
         QTest::newRow("list with Captions, preset: caption") << "ListOfCaptions.qml" << QUrl();
+        QTest::newRow("list with Captions 1.3, preset: caption") << "ListOfCaptions13.qml" << QUrl();
         QTest::newRow("list with ListItems.Empty (equivalent to the new ListItem") << "ListItemsEmptyList.qml" << QUrl();
         // disable this test as it takes >20 seconds. Kept still for measurements to be done during development
 //        QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();

=== modified file 'tests/unit/tst_performance/tst_performance.pro'
--- tests/unit/tst_performance/tst_performance.pro	2015-09-06 17:59:49 +0000
+++ tests/unit/tst_performance/tst_performance.pro	2015-09-28 07:37:49 +0000
@@ -33,4 +33,6 @@
     StyledItemNewTheming.qml \
     AbstractButtonGrid.qml \
     AbstractButton13Grid.qml \
-    LabelGrid13.qml
+    LabelGrid13.qml \
+    ListOfCaptions13.qml \
+    ListItemList13.qml