Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-27 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

OTA12-2016-06-27

OTA12-2016-06-27

[Zoltan Balogh (bzoltan)]

review: Needs Fixing

[lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-27]

2022. By Tim Peeters on 2016-06-30

Add Header.automaticHeight property. Fixes: https://bugs.launchpad.net/bugs/1540240.

Approved by ubuntu-sdk-build-bot, Christian Dywan.

2023. By Cris Dywan on 2016-06-30

Stop using macros for namespaces in headers. Fixes: https://bugs.launchpad.net/bugs/1596536.

Approved by ubuntu-sdk-build-bot, Zoltan Balogh.

2024. By Loïc Molinari on 2016-06-30

Expansion of LD_LIBRARY_PATH is broken since it doesn't include a ":", which means PerformanceMetrics path, which is at the end, is actually not available, nor the current content of LD_LIBRARY_PATH.

That fixes it using the proper shell expansion syntax.

Approved by ubuntu-sdk-build-bot, Andrea Bernabei.

2025. By Florian Boucault on 2016-07-04

Icon: only load when completed and therefore avoids multiple reloads caused by size changes.

Approved by ubuntu-sdk-build-bot, Christian Dywan.

2026. By William Hua on 2016-07-04

Make qml-module-ubuntu-components-gles depend on qml-module-ubuntu-performancemetrics-gles.

Approved by ubuntu-sdk-build-bot, Christian Dywan.

2027. By Florian Boucault on 2016-07-05

Scrollbar: load stepper icon asynchronously.

Approved by ubuntu-sdk-build-bot, Andrea Bernabei.

2028. By Zsombor Egri on 2016-07-11

Remove fw-headers from UbuntuGestures and UbuntuToolkit. We are no longer supporting them as public C++ API.

Approved by ubuntu-sdk-build-bot, Zoltan Balogh.

2029. By Zoltan Balogh on 2016-07-11

Break unity8 before 8.13.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2030. By Cris Dywan on 2016-07-11

More robust list and namespace handling in apicheck. Fixes: https://bugs.launchpad.net/bugs/1595461.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

2031. By Cris Dywan on 2016-07-12

Add a snippet about tests to the toplevel README.

Approved by ubuntu-sdk-build-bot.

2032. By Cris Dywan on 2016-07-12

Launcher: create QQuickView if no window provided. Fixes: https://bugs.launchpad.net/bugs/1597672.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

2033. By Cris Dywan on 2016-07-14

Increase focus ring thickness from 1dp to 2dp. Fixes: https://bugs.launchpad.net/bugs/1602690.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

2034. By Cris Dywan on 2016-07-18

Include indexes in "offline" docs and filter out link errors. Fixes: https://bugs.launchpad.net/bugs/1603937.

Approved by ubuntu-sdk-build-bot, Andrea Bernabei.

2035. By Tim Peeters on 2016-07-18

Fix assigning of constant values to a grouped property in StyleHints. Fixes: https://bugs.launchpad.net/bugs/1602836.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2036. By Zsombor Egri on 2016-07-19

Fix BottomEdge content URL preloading. Fixes: https://bugs.launchpad.net/bugs/1604509.

Approved by ubuntu-sdk-build-bot, Tim Peeters, Andrew Hayzen.

2037. By Tim Peeters on 2016-07-19

Configure colors of the buttons in the ActionBar and PageHeader through their Styles. Fixes: https://bugs.launchpad.net/bugs/1597774.

Approved by ubuntu-sdk-build-bot, Christian Dywan.

2038. By Albert Astals Cid on 2016-07-20

UCUnits::resolveResource: Prefer image path if it exists

This saves searching the disk for @gu images, which is a big speedup

According to callgrind loading 100 images from a folder that contains 380 images goes from
around 3 million instructions per UCUnits::resolveResource call down to around 10 thousand

This optimization is ok since it is not correct to ship both
        image.png
and
        [e-mail]
you either have to ship gu-enabled files or not, but mixing them is not allowed.

Searched for cases in which that may be happening in my phone and found none. Fixes: https://bugs.launchpad.net/bugs/1604029.

Approved by ubuntu-sdk-build-bot, Christian Dywan, Andrea Bernabei.

2039. By Zsombor Egri on 2016-07-20

Fix null pointer property initializer used with 1.3 PageWrapper. Fixes: https://bugs.launchpad.net/bugs/1604780.

Approved by ubuntu-sdk-build-bot, Christian Dywan.

2040. By Andrea Bernabei on 2016-07-22

ListItemLayout doc: add elide mode change example and add section about labels default properties values. Fixes: https://bugs.launchpad.net/bugs/1603450.

Approved by ubuntu-sdk-build-bot, Christian Dywan, Jonas G. Drange.

2041. By Timo Jyrinki on 2016-07-26

Disable documentation building for GLES builds. Fixes: https://bugs.launchpad.net/bugs/1606222.

Approved by ubuntu-sdk-build-bot.

=== modified file '.bazaar/plugins/packaging_sorting.py'
--- .bazaar/plugins/packaging_sorting.py	2016-04-21 03:23:24 +0000
+++ .bazaar/plugins/packaging_sorting.py	2016-07-26 08:38:05 +0000
@@ -25,6 +25,8 @@
                     future_revid, tree_delta, future_tree):
     """Ensure packaging has gone through wrap-and-sort command"""
 
+    if (master.get_parent() is None):
+        return
     if (master.get_parent().find("ubuntu-ui-toolkit") == -1):
         return
 

=== modified file '.qmake.conf'
--- .qmake.conf	2016-05-13 09:11:23 +0000
+++ .qmake.conf	2016-07-26 08:38:05 +0000
@@ -23,3 +23,9 @@
         QMAKE_CXXFLAGS += -Wsuggest-override
     }
 }
+
+# FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.
+# build UbuntuToolkit without namespace
+DEFINES += UBUNTUTOOLKIT_NO_NAMESPACE
+# build UbuntuGestures without namespace
+# DEFINES += UBUNTUGESTURES_NO_NAMESPACE

=== modified file 'apicheck/apicheck.cpp'
--- apicheck/apicheck.cpp	2016-03-17 21:11:09 +0000
+++ apicheck/apicheck.cpp	2016-07-26 08:38:05 +0000
@@ -38,6 +38,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 #define foreach Q_FOREACH
 #include <QtQml/private/qqmlengine_p.h>
@@ -140,30 +141,37 @@
 */
 QByteArray convertToId(const QString &cppName)
 {
-    QString qmlType(cppName);
+    QString qmlType(QString(qPrintable(cppName)).replace(QRegExp("(QQmlListProperty|QList)<(.+)>"), "\\2"));
+    QString typeFormat(qmlType != cppName ? "list<%1>" : "%1");
+
+    QList<const QQmlType*>types(qmlTypesByCppName[qPrintable(qmlType)].toList());
+    std::sort(types.begin(), types.end(), typeNameSort);
+
     if (qmlType.contains("::")) {
         QStringList parts(qmlType.split("::"));
-        return qPrintable(convertToId(parts[0]) + "." + convertToId(parts[1]));
+        // Enum or Flags
+        if (parts.length() > 2) {
+            qmlType = convertToId(parts[0] + "::" + parts[1]) + "." + parts[2];
+        } else {
+            // Namespace
+            qmlType = parts[1];
+            // FIXME: Namespaces in properties?
+            if (parts[0] == "Qt" || parts[0] == "RenderTimer")
+                return qPrintable(typeFormat.arg(parts[0] + "." + qmlType));
+        }
     }
 
-    QList<const QQmlType*>types(qmlTypesByCppName[qPrintable(cppName)].toList());
-    std::sort(types.begin(), types.end(), typeNameSort);
-    if (!types.isEmpty())
-        qmlType = QString(types[0]->qmlTypeName()).split("/")[1].toUtf8();
-    else
-        qmlType = cppToId.value(qPrintable(qmlType), qPrintable(cppName));
+    if (types.isEmpty())
+        qmlType = cppToId.value(qPrintable(qmlType), qPrintable(qmlType));
+    else {
+        // Cache QML type name
+        QString newQmlType(QString(types[0]->qmlTypeName()).split("/")[1].toUtf8());
+        cppToId.insert(qPrintable(qmlType), qPrintable(newQmlType));
+        qmlType = newQmlType;
+    }
     // Strip internal _QMLTYPE_xy suffix
     qmlType = qmlType.split("_")[0];
-    // List type
-    if (qmlType.startsWith("QQmlListProperty<")) {
-        QString subType(qmlType.mid(17, qmlType.size() - 18));
-        qmlType = "list<" + convertToId(subType) + ">";
-    }
-    else if (qmlType.startsWith("QList<")) {
-        QString subType(qmlType.mid(6, qmlType.size() - 7));
-        qmlType = "list<" + convertToId(subType) + ">";
-    }
-    return qPrintable(qmlType.replace("QTestRootObject", "QtObject"));
+    return qPrintable(typeFormat.arg(qmlType));
 }
 
 QByteArray convertToId(const QMetaObject *mo)
@@ -626,7 +634,7 @@
         // Two leading underscores: internal API
         if (name.startsWith("__"))
             return;
-        const QString typeName = meth.typeName();
+        QString typeName = meth.typeName();
 
         if (implicitSignals.contains(name)
                 && !meth.revision()
@@ -652,6 +660,8 @@
         if (revision && object->contains("#version"))
             method["version"] = object->value("#version").toString();
 
+        if (typeName.endsWith("*"))
+            typeName.truncate(typeName.size() - 1);
         if (typeName != QLatin1String("void"))
             method["returns"] = typeName;
 
@@ -850,6 +860,7 @@
     cppToId.insert("QPoint", "Qt.point");
     cppToId.insert("QColor", "color");
     cppToId.insert("QQmlEasingValueType::Type", "Type");
+    cppToId.insert("QTestRootObject", "QtObject");
 
     // find a valid QtQuick import
     QByteArray importCode;

=== modified file 'components.api'
--- components.api	2016-06-14 10:04:01 +0000
+++ components.api	2016-07-26 08:38:05 +0000
@@ -24,13 +24,6 @@
     property var shortcut 1.3
     property string text
     property bool visible
-Ubuntu.Components.Action.Type: Enum
-    Bool
-    Integer
-    None
-    Object
-    Real
-    String
 Ubuntu.Components.ActionBar 1.3: StyledItem
     property list<Action> actions
     property Component delegate
@@ -86,7 +79,7 @@
 Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
     property bool asynchronous
     readonly property int columns
-    property list<PageColumnsLayou> layouts
+    property list<PageColumnsLayout> layouts
     function var addPageToCurrentColumn(var sourcePage, var page, var properties)
     function var addPageToNextColumn(var sourcePage, var page, var properties)
     function var removePages(var page)
@@ -105,51 +98,13 @@
     property url sound
     readonly property Status status
     property AlarmType type
-Ubuntu.Components.Alarm.AlarmType: Enum
+Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel
+    readonly property int count
+    function refresh() 1.0
+    function Alarm get(int index)
+Ubuntu.Components.AlarmType: Enum
     OneTime
     Repeating
-Ubuntu.Components.Alarm.DayOfWeek: Enum
-    AutoDetect
-    Daily
-    Friday
-    Monday
-    Saturday
-    Sunday
-    Thursday
-    Tuesday
-    Wednesday
-Ubuntu.Components.Alarm.DaysOfWeek: Flag
-    AutoDetect
-    Daily
-    Friday
-    Monday
-    Saturday
-    Sunday
-    Thursday
-    Tuesday
-    Wednesday
-Ubuntu.Components.Alarm.Error: Enum
-    AdaptationError
-    EarlyDate
-    InvalidDate
-    InvalidEvent
-    NoDaysOfWeek
-    NoError
-    OneTimeOnMoreDays
-    OperationPending
-Ubuntu.Components.Alarm.Operation: Enum
-    Canceling
-    NoOperation
-    Reseting
-    Saving
-Ubuntu.Components.Alarm.Status: Enum
-    Fail
-    InProgress
-    Ready
-Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel
-    readonly property int count
-    function refresh() 1.0
-    function UCAlarm* get(int index)
 Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject
     property string help
     function var at(int i)
@@ -165,6 +120,13 @@
     function quitWithError(string errorMessage)
     function quitWithError()
     readonly property QQmlPropertyMap values
+Ubuntu.Components.Aspect: Enum
+    DropShadow
+    Flat
+    Inset
+Ubuntu.Components.BackgroundMode: Enum
+    SolidColor
+    VerticalGradient
 Ubuntu.Components.ListItems.Base 1.0 0.1: Empty
     property string fallbackIconName
     property url fallbackIconSource
@@ -186,8 +148,8 @@
     readonly property double dragProgress
     readonly property BottomEdgeHint hint
     signal dragProgressChanged(double dragProgress)
-    signal dragDirectionChanged(BottomEdge.DragDirection direction)
-    signal statusChanged(BottomEdge.Status status)
+    signal dragDirectionChanged(DragDirection direction)
+    signal statusChanged(Status status)
     signal contentChanged(url url)
     signal contentComponentChanged(Component component)
     signal activeRegionChanged(BottomEdgeRegion activeRegion)
@@ -200,25 +162,12 @@
     property bool preloadContent
     property list<BottomEdgeRegion> regions
     readonly property Status status
-Ubuntu.Components.BottomEdge.DragDirection: Enum
-    Downwards
-    Undefined
-    Upwards
-Ubuntu.Components.BottomEdge.Status: Enum
-    Committed
-    Hidden
-    Revealed
 Ubuntu.Components.BottomEdgeHint 1.3 UCBottomEdgeHint: ActionItem
     property int deactivateTimeout
     property Flickable flickable
     signal clicked()
     property Status status
     readonly property SwipeArea swipeArea
-Ubuntu.Components.BottomEdgeHint.Status: Enum
-    Active
-    Hidden
-    Inactive
-    Locked
 Ubuntu.Components.BottomEdgeRegion 1.3 UCBottomEdgeRegion: QtObject
     property Component contentComponent
     property url contentUrl
@@ -264,6 +213,9 @@
     property int captionStyle
     readonly property Label subtitle
     readonly property Label title
+Ubuntu.Components.CaptionsStyle: Enum
+    SummaryCaptionStyle
+    TitleCaptionStyle
 Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton
     property bool checked
 Ubuntu.Components.CheckBox 1.3: AbstractButton
@@ -272,7 +224,7 @@
     readonly property MimeData data
     function push(var data)
     function clear()
-    function QQuickMimeData* newData()
+    function MimeData newData()
 Ubuntu.Components.ColorUtils 1.0 0.1: QtObject singleton
     function double luminance(color color)
 Ubuntu.Components.ComboButton 1.1: Button
@@ -370,6 +322,26 @@
     readonly property int week
     readonly property int year
 Ubuntu.Components.DateUtils 0.1 1.0 1.3
+Ubuntu.Components.DayOfWeek: Enum
+    AutoDetect
+    Daily
+    Friday
+    Monday
+    Saturday
+    Sunday
+    Thursday
+    Tuesday
+    Wednesday
+Ubuntu.Components.DaysOfWeek: Flag
+    AutoDetect
+    Daily
+    Friday
+    Monday
+    Saturday
+    Sunday
+    Thursday
+    Tuesday
+    Wednesday
 Ubuntu.Components.Popups.DefaultSheet 1.0 0.1: SheetBase
     property bool doneButton
     signal closeClicked()
@@ -432,6 +404,10 @@
     property string title
 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
 Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
+Ubuntu.Components.DragDirection: Enum
+    Downwards
+    Undefined
+    Upwards
 Ubuntu.Components.ListItems.Empty 1.0 0.1: AbstractButton
     property list<Item> backgroundIndicator
     property bool confirmRemoval
@@ -456,6 +432,15 @@
     property bool showDivider
     readonly property string swipingState
     readonly property bool waitingConfirmationForRemoval
+Ubuntu.Components.Error: Enum
+    AdaptationError
+    EarlyDate
+    InvalidDate
+    InvalidEvent
+    NoDaysOfWeek
+    NoError
+    OneTimeOnMoreDays
+    OperationPending
 Ubuntu.Components.ListItems.Expandable 1.0 0.1: Empty
     property bool collapseOnClick
     property double collapsedHeight
@@ -474,9 +459,28 @@
     readonly property var expandedItem
     function var expandItem(var item)
     function var collapse()
+Ubuntu.Components.ExpansionFlag: Enum
+    CollapseOnOutsidePress
+    Exclusive
+    UnlockExpanded
+Ubuntu.Components.FillMode: Enum
+    Pad
+    PreserveAspectCrop
+    PreserveAspectFit
+    Stretch
 Ubuntu.Components.FilterBehavior 1.1: QtObject
     property QRegExp pattern
     property string property
+Ubuntu.Components.Frequency: Enum
+    Disabled
+    Hour
+    Minute
+    Relative
+    Second
+Ubuntu.Components.HAlignment: Enum
+    AlignHCenter
+    AlignLeft
+    AlignRight
 Ubuntu.Components.Haptics 1.0 0.1: QtObject singleton
     readonly property QtObject effect
     readonly property bool enabled
@@ -503,6 +507,7 @@
 Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
     property string text
 Ubuntu.Components.Header 1.3 UCHeader: StyledItem
+    property bool automaticHeight
     property bool exposed
     property Flickable flickable
     readonly property bool moving
@@ -554,13 +559,6 @@
 Ubuntu.Components.Label 1.3 UCLabel: Text
     property string fontSize
     property TextSize textSize
-Ubuntu.Components.Label.TextSize: Enum
-    Large
-    Medium
-    Small
-    XLarge
-    XSmall
-    XxSmall
 Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
     readonly property string currentLayout
     property list<ConditionalLayout> layouts
@@ -598,10 +596,6 @@
     property int minimumIndex
     readonly property Status status
     readonly property int to
-Ubuntu.Components.ListItemDrag.Status: Enum
-    Dropped
-    Moving
-    Started
 Ubuntu.Components.ListItemLayout 1.3 UCListItemLayout: SlotsLayout
     readonly property Label subtitle
     readonly property Label summary
@@ -619,12 +613,6 @@
     property Frequency frequency
     signal trigger()
     property QDateTime relativeTime
-Ubuntu.Components.LiveTimer.Frequency: Enum
-    Disabled
-    Hour
-    Minute
-    Relative
-    Second
 Ubuntu.Components.MainView 1.0 0.1: MainViewBase
     property bool automaticOrientation
     default property list<QtObject> contentsItem
@@ -679,9 +667,6 @@
     signal entered(QQuickMouseEvent event, Item host)
     signal exited(QQuickMouseEvent event, Item host)
     property Priority priority
-Ubuntu.Components.Mouse.Priority: Enum
-    AfterItem
-    BeforeItem
 Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton
     property bool enabled
     signal enabledChanged(bool value)
@@ -691,6 +676,11 @@
     property var values
 Ubuntu.Components.Object 1.0 0.1: QtObject
     default property list<QtObject> children
+Ubuntu.Components.Operation: Enum
+    Canceling
+    NoOperation
+    Reseting
+    Saving
 Ubuntu.Components.OptionSelector 1.0 0.1: Empty
     property bool colourImage
     property double containerHeight
@@ -762,7 +752,7 @@
     property double minimumWidth
     property double preferredWidth
 Ubuntu.Components.PageColumnsLayout 1.3: QtObject
-    default property list<PageColum> data
+    default property list<PageColumn> data
     property bool when
 Ubuntu.Components.PageHeadConfiguration 1.1: Object
     property list<Action> actions
@@ -1014,6 +1004,9 @@
     function var hide()
 Ubuntu.Components.PopupContext 1.3 UCPopupContext: ActionContext
 Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
+Ubuntu.Components.Priority: Enum
+    AfterItem
+    BeforeItem
 Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
     property bool indeterminate
     property double maximumValue
@@ -1090,15 +1083,10 @@
     property string serviceInterface 1.1
     readonly property Status status 1.1
     property ServiceType type 1.1
-Ubuntu.Components.ServiceProperties.ServiceType: Enum
+Ubuntu.Components.ServiceType: Enum
     Session
     System
     Undefined
-Ubuntu.Components.ServiceProperties.Status: Enum
-    Active
-    ConnectionError
-    Inactive
-    Synchronizing
 Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase
     default property list<QtObject> container
     property double contentsHeight
@@ -1140,15 +1128,10 @@
 Ubuntu.Components.SlotsAttached 1.3: QtObject
     property bool overrideVerticalPositioning
     readonly property SlotsLayoutPadding padding
-    property SlotsLayout.UCSlotPosition position
+    property UCSlotPosition position
 Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item
     property Item mainSlot
     readonly property SlotsLayoutPadding padding
-Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
-    First
-    Last
-    Leading
-    Trailing
 Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject
     property double bottom
     property double leading
@@ -1179,6 +1162,32 @@
     property bool iconFrame
     property bool progression
 Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject
+Ubuntu.Components.Status: Enum
+    Finished
+    Started
+    Updated
+Ubuntu.Components.Status: Enum
+    Active
+    ConnectionError
+    Inactive
+    Synchronizing
+Ubuntu.Components.Status: Enum
+    Dropped
+    Moving
+    Started
+Ubuntu.Components.Status: Enum
+    Active
+    Hidden
+    Inactive
+    Locked
+Ubuntu.Components.Status: Enum
+    Committed
+    Hidden
+    Revealed
+Ubuntu.Components.Status: Enum
+    Fail
+    InProgress
+    Ready
 Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject
     property bool ignoreUnknownProperties
 Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item
@@ -1194,7 +1203,7 @@
     property string subText
 Ubuntu.Components.ListItems.Subtitled 1.3: Base
     property string subText
-Ubuntu.Components.SwipeArea 1.3 UCSwipeArea: Item
+Ubuntu.Components.SwipeArea 1.3 UbuntuGestures::UCSwipeArea: Item
     property Direction direction
     readonly property double distance
     readonly property bool dragging
@@ -1221,10 +1230,6 @@
     readonly property QPointF from
     readonly property Status status
     readonly property QPointF to
-Ubuntu.Components.SwipeEvent.Status: Enum
-    Finished
-    Started
-    Updated
 Ubuntu.Components.Switch 1.0 0.1: AbstractButton
     property bool checked
 Ubuntu.Components.Switch 1.3: AbstractButton
@@ -1529,6 +1534,13 @@
     readonly property int selectionStart
     property QValidator validator
     property int verticalAlignment
+Ubuntu.Components.TextSize: Enum
+    Large
+    Medium
+    Small
+    XLarge
+    XSmall
+    XxSmall
 Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item
     property QImage image
 Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject
@@ -1572,6 +1584,13 @@
     property Item pageStack
 Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
     property Component defaultDelegate
+Ubuntu.Components.Type: Enum
+    Bool
+    Integer
+    None
+    Object
+    Real
+    String
 UCActionContextAttached: QtObject
 Ubuntu.Components.UCApplication 1.0 0.1: QtObject
     property string applicationName
@@ -1591,6 +1610,11 @@
     property double left
     property double right
     property double top
+Ubuntu.Components.UCSlotPosition: Enum
+    First
+    Last
+    Leading
+    Trailing
 UCStateSaverAttached: QtObject
     property bool enabled
     property string properties
@@ -1611,9 +1635,6 @@
     readonly property ushort toolkitVersion
     readonly property ushort toolkitVersionMajor
     readonly property ushort toolkitVersionMinor
-Ubuntu.Components.Ubuntu.CaptionsStyle: Enum
-    SummaryCaptionStyle
-    TitleCaptionStyle
 Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton
     readonly property int BriskDuration
     readonly property int FastDuration
@@ -1700,29 +1721,6 @@
     property WrapMode sourceVerticalWrapMode 1.3
     property bool stretched
     property VAlignment verticalAlignment
-Ubuntu.Components.UbuntuShape.Aspect: Enum
-    DropShadow
-    Flat
-    Inset
-Ubuntu.Components.UbuntuShape.BackgroundMode: Enum
-    SolidColor
-    VerticalGradient
-Ubuntu.Components.UbuntuShape.FillMode: Enum
-    Pad
-    PreserveAspectCrop
-    PreserveAspectFit
-    Stretch
-Ubuntu.Components.UbuntuShape.HAlignment: Enum
-    AlignHCenter
-    AlignLeft
-    AlignRight
-Ubuntu.Components.UbuntuShape.VAlignment: Enum
-    AlignBottom
-    AlignTop
-    AlignVCenter
-Ubuntu.Components.UbuntuShape.WrapMode: Enum
-    Repeat
-    Transparent
 Ubuntu.Components.UbuntuShapeOverlay 1.2 UCUbuntuShapeOverlay: UbuntuShape
     property color overlayColor
     property QRectF overlayRect
@@ -1754,6 +1752,10 @@
     readonly property QuickTestUtil testUtil
 Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
     signal opened(QStringList uris)
+Ubuntu.Components.VAlignment: Enum
+    AlignBottom
+    AlignTop
+    AlignVCenter
 Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
     property bool expanded
     property string fallbackIconName
@@ -1779,10 +1781,9 @@
     signal expandedIndicesChanged(list<int> indices)
     property bool selectMode
     property list<int> selectedIndices
-Ubuntu.Components.ViewItems.ExpansionFlag: Enum
-    CollapseOnOutsidePress
-    Exclusive
-    UnlockExpanded
+Ubuntu.Components.WrapMode: Enum
+    Repeat
+    Transparent
 Ubuntu.Components.i18n 1.0 0.1: QtObject
     property string domain
     property string language

=== modified file 'debian/bileto_convert_to_gles'
--- debian/bileto_convert_to_gles	2016-07-26 05:13:31 +0000
+++ debian/bileto_convert_to_gles	2016-07-26 08:38:05 +0000
@@ -12,6 +12,8 @@
 
 sed --in-place 's/^ubuntu-ui-toolkit /ubuntu-ui-toolkit-gles /g' debian/changelog
 
+patch -p1 < debian/gles-disable-documentation.patch
+
 for gles in libubuntugestures5-gles.install libubuntugestures5-gles-dev.install libubuntutoolkit5-gles.install libubuntutoolkit5-gles-dev.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides qml-module-ubuntu-performancemetrics-gles.install ; do
     mv --verbose debian/"$(echo $gles | sed 's/-gles//')" debian/$gles
 done

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-26 05:13:31 +0000
+++ debian/changelog	2016-07-26 08:38:05 +0000
@@ -1,9 +1,77 @@
+<<<<<<< TREE
 ubuntu-ui-toolkit (1.3.2009+16.10.20160615.3build1~1) yakkety; urgency=medium
 
   * Rebuild against Qt 5.6.
 
  -- Timo Jyrinki <[e-mail]>  Wed, 20 Jul 2016 15:20:21 +0300
 
+=======
+ubuntu-ui-toolkit (1.3.2030+16.10) UNRELEASED; urgency=medium
+  [ William Hua ]
+  * Make qml-module-ubuntu-components-gles depend on 
+    qml-module-ubuntu-performancemetrics-gles.
+
+  [ Christian Dywan ]
+  * Set default for TextArea.persistentSelection and correct type. 
+    Fixes LP: #1594400
+  * Add version suffix to all unit tests in visual.
+  * Stop using macros for namespaces in headers. Fixes LP: #1596536.
+  * More robust list and namespace handling in apicheck. Fixes LP: #1595461
+
+
+  [ Zsombor Egri ]
+  * Separate plugin for Ubuntu.Components.Labs.
+  * Create separate plugin for Ubuntu.Components.Styles.
+  * Move C++ components into UbuntuToolkit library.
+  * Remove fw-headers from UbuntuGestures and UbuntuToolkit. We are no longer
+    supporting them as public C++ API.
+
+  [ Zoltán Balogh ]
+  * Break unity8 with lower version 8.13.
+
+  [ Tim Peeters ]
+  * Improve the i18n documentation for plurals. Fixes LP: #1184810
+  * Don't get APL subheader colors from MainView AppHeader when there is no 
+    MainView. Fixes LP: #1588172
+  * Add Header.automaticHeight property. Fixes LP: #1540240
+
+  [ Loïc Molinari ]
+  * UbuntuShape - Use reference counting to handle shape textures.
+    The current shape textures handling system requires to search for the 
+    textures associated to the current graphics context by doing a search in an
+    array for each item at each updatePaintNode() call. It also deletes the 
+    textures on OpenGLContext::aboutToBeDestroyed() signal emission, which 
+    appears in some cases to not have any OpenGL context bound.
+    We propose an alternative to create and destroy shape textures per material 
+    creation and destruction with a reference counting mechanism to minimise 
+    costly calls. We search for the shape textures (hash lookup with an OpenGL 
+    context pointer as the key) only when a texture material is created or 
+    deleted, which is much more occasional compared to updatePaintNode() calls.
+    That also ensures textures are deleted with the proper OpenGL context bound.
+    The only drawback is that shape textures are deleted when there is no shape 
+    items anymore in a scene and recreated when there is a new one appearing. 
+    These operations being quite uncommon and relatively fast, the advantages 
+    seem to be higher than the drawbacks.
+  * Expansion of LD_LIBRARY_PATH is broken since it doesn't include a ":", which
+    means PerformanceMetrics path, which is at the end, is actually not 
+    available, nor the current content of LD_LIBRARY_PATH.
+    That fixes it using the proper shell expansion syntax.
+
+  [ Timo Jyrinki ]
+  * Fix packaging sorting bzr hook to work on bzr branches that are local only.
+  * Disable documentation building for GLES builds
+
+  [ Florian Boucault ]
+  * ProgressionVisual: do not load the icon until the progression is made 
+    visible.
+  * Scrollbar: do not load the stepper icon until it is visible.
+  * Scrollbar: load stepper icon asynchronously.
+  * Icon: only load when completed and therefore avoids multiple reloads caused
+    by size changes.
+                                                                
+ -- Zoltán Balogh <[e-mail]>  Mon, 27 Jun 2016 08:10:03 +0200
+
+>>>>>>> MERGE-SOURCE
 ubuntu-ui-toolkit (1.3.2009+16.10.20160615.3) yakkety; urgency=medium
 
   [ Tim Peeters ]

=== modified file 'debian/control'
--- debian/control	2016-06-03 04:28:05 +0000
+++ debian/control	2016-07-26 08:38:05 +0000
@@ -85,6 +85,7 @@
          ${shlibs:Depends},
 Conflicts: qt-components-ubuntu,
 Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+        unity8 (<< 8.14),
 Replaces: qt-components-ubuntu,
           qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
 Provides: qt-components-ubuntu,
@@ -94,6 +95,35 @@
  .
  This package contains the Ubuntu Components QML plugin.
 
+Package: qml-module-ubuntu-components-labs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: libqt5svg5,
+         libubuntugestures5 (= ${binary:Version}),
+         libubuntutoolkit5 (= ${binary:Version}),
+         qml-module-qtfeedback,
+         qml-module-qtgraphicaleffects,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick-window2,
+         qml-module-qtquick2,
+         qml-module-ubuntu-performancemetrics,
+         qtdeclarative5-unity-action-plugin (>= 1.1.0),
+         suru-icon-theme,
+         ttf-ubuntu-font-family,
+         ubuntu-ui-toolkit-theme (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Conflicts: qt-components-ubuntu-labs,
+Replaces: qt-components-ubuntu-labs,
+Provides: qt-components-ubuntu-labs,
+Description: Qt Components Labs for Ubuntu - Components QML plugin
+ Qt Components Labs for Ubuntu offers a set of non-released and mostly
+ unstable user interface components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Components Labs QML plugin.
+
 Package: qml-module-ubuntu-layouts
 Architecture: any
 Multi-Arch: same
@@ -102,6 +132,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+        unity8 (<< 8.14),
 Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
 Description: Qt Components for Ubuntu - Layouts QML plugin
  Qt Components for Ubuntu offers a set of reusable user interface
@@ -119,6 +150,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+        unity8 (<< 8.14),
 Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
 Description: Qt Components for Ubuntu - Test QML plugin
  Qt Components for Ubuntu offers a set of reusable user interface
@@ -134,6 +166,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+        unity8 (<< 8.14),
 Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
 Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin
  Qt Components for Ubuntu offers a set of reusable user interface

=== modified file 'debian/control.gles'
--- debian/control.gles	2016-06-03 06:01:35 +0000
+++ debian/control.gles	2016-07-26 08:38:05 +0000
@@ -83,6 +83,7 @@
 Package: qml-module-ubuntu-components-gles
 Architecture: amd64 i386
 Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+        unity8 (<< 8.13),
 Conflicts: qml-module-ubuntu-components,
            qtdeclarative5-ubuntu-ui-toolkit-plugin,
 Replaces: qml-module-ubuntu-components,
@@ -101,6 +102,7 @@
          qml-module-qtquick-layouts,
          qml-module-qtquick-window2,
          qml-module-qtquick2,
+         qml-module-ubuntu-performancemetrics-gles,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,
          ttf-ubuntu-font-family,
@@ -114,9 +116,41 @@
  This package contains the Ubuntu Components QML plugin (built with
  the OpenGLES backend).
 
+Package: qml-module-ubuntu-components-labs-gles
+Architecture: amd64 i386
+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+        unity8 (<< 8.13),
+Conflicts: qml-module-ubuntu-components-labs,
+Replaces: qml-module-ubuntu-components-labs,
+Provides: qml-module-ubuntu-components-labs,
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: libqt5svg5,
+         libubuntugestures5-gles (= ${binary:Version}),
+         libubuntutoolkit5-gles (= ${binary:Version}),
+         qml-module-qtfeedback,
+         qml-module-qtgraphicaleffects,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick-window2,
+         qml-module-qtquick2,
+         qtdeclarative5-unity-action-plugin (>= 1.1.0),
+         suru-icon-theme,
+         ttf-ubuntu-font-family,
+         ubuntu-ui-toolkit-theme,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt Components Labs for Ubuntu - QML plugin - GLES
+ Qt Components Labs for Ubuntu offers a set of non-released and mostly
+ unstable user interface components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Components Labs QML plugin (built with
+ the OpenGLES backend).
+
 Package: qml-module-ubuntu-performancemetrics-gles
 Architecture: amd64 i386
 Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+        unity8 (<< 8.13),
 Conflicts: qml-module-ubuntu-performancemetrics,
 Replaces: qml-module-ubuntu-performancemetrics,
           qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),

=== added file 'debian/gles-disable-documentation.patch'
--- debian/gles-disable-documentation.patch	1970-01-01 00:00:00 +0000
+++ debian/gles-disable-documentation.patch	2016-07-26 08:38:05 +0000
@@ -0,0 +1,11 @@
+--- a/ubuntu-sdk.pro.old	2016-07-25 15:39:16.754519000 +0300
++++ b/ubuntu-sdk.pro	2016-07-25 15:41:39.527828931 +0300
+@@ -11,7 +11,7 @@
+ src_uitk_launcher.subdir = ubuntu-ui-toolkit-launcher
+ src_uitk_launcher.depends = sub-src
+ 
+-SUBDIRS += po documentation app-launch-profiler src_uitk_launcher apicheck
++SUBDIRS += po app-launch-profiler src_uitk_launcher apicheck
+ 
+ sub_tests.CONFIG -= no_default_target
+ sub_tests.CONFIG -= no_default_install

=== modified file 'debian/libubuntugestures5-dev.install'
--- debian/libubuntugestures5-dev.install	2016-03-04 11:58:12 +0000
+++ debian/libubuntugestures5-dev.install	2016-07-26 08:38:05 +0000
@@ -1,32 +1,10 @@
-usr/include/*/qt5/UbuntuGestures/AbstractTimer
-usr/include/*/qt5/UbuntuGestures/AbstractTimerFactory
-usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
-usr/include/*/qt5/UbuntuGestures/DebugHelpers
-usr/include/*/qt5/UbuntuGestures/FakeTimeSource
-usr/include/*/qt5/UbuntuGestures/FakeTimer
-usr/include/*/qt5/UbuntuGestures/FakeTimerFactory
-usr/include/*/qt5/UbuntuGestures/Pool
-usr/include/*/qt5/UbuntuGestures/RealTimeSource
-usr/include/*/qt5/UbuntuGestures/SharedTimeSource
-usr/include/*/qt5/UbuntuGestures/TimeSource
-usr/include/*/qt5/UbuntuGestures/Timer
-usr/include/*/qt5/UbuntuGestures/TimerFactory
-usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
-usr/include/*/qt5/UbuntuGestures/TouchRegistry
 usr/include/*/qt5/UbuntuGestures/UbuntuGestures
 usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesModule
 usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
-usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
-usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
-usr/include/*/qt5/UbuntuGestures/debughelpers.h
-usr/include/*/qt5/UbuntuGestures/pool.h
-usr/include/*/qt5/UbuntuGestures/timer.h
-usr/include/*/qt5/UbuntuGestures/timesource.h
-usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
-usr/include/*/qt5/UbuntuGestures/touchregistry.h
 usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesmodule.h
 usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
-usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
 usr/lib/*/libUbuntuGestures.la
 usr/lib/*/libUbuntuGestures.prl
 usr/lib/*/libUbuntuGestures.so

=== modified file 'debian/libubuntugestures5-private-dev.install'
--- debian/libubuntugestures5-private-dev.install	2016-03-04 11:58:12 +0000
+++ debian/libubuntugestures5-private-dev.install	2016-07-26 08:38:05 +0000
@@ -1,3 +1,1 @@
-usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/damper_p.h
-usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/ucswipearea_p.h
-usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/ucswipearea_p_p.h
+usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/*_p.h

=== modified file 'debian/libubuntutoolkit5-dev.install'
--- debian/libubuntutoolkit5-dev.install	2016-06-02 12:50:02 +0000
+++ debian/libubuntutoolkit5-dev.install	2016-07-26 08:38:05 +0000
@@ -1,17 +1,9 @@
-usr/include/*/qt5/UbuntuToolkit/AsyncLoader
-usr/include/*/qt5/UbuntuToolkit/ColorUtils
-usr/include/*/qt5/UbuntuToolkit/MouseTouchAdaptor
-usr/include/*/qt5/UbuntuToolkit/PropertyChange
-usr/include/*/qt5/UbuntuToolkit/Tree
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitModule
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
-usr/include/*/qt5/UbuntuToolkit/asyncloader.h
-usr/include/*/qt5/UbuntuToolkit/colorutils.h
-usr/include/*/qt5/UbuntuToolkit/mousetouchadaptor.h
-usr/include/*/qt5/UbuntuToolkit/propertychange.h
-usr/include/*/qt5/UbuntuToolkit/tree.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitmodule.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
 usr/lib/*/libUbuntuToolkit.la
 usr/lib/*/libUbuntuToolkit.prl

=== added file 'debian/qml-module-ubuntu-components-labs.install'
--- debian/qml-module-ubuntu-components-labs.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-components-labs.install	2016-07-26 08:38:05 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/qt5/qml/Ubuntu/Components/Labs/libUbuntuComponentsLabs.so
+usr/lib/*/qt5/qml/Ubuntu/Components/Labs/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Components/Labs/qmldir

=== modified file 'debian/qml-module-ubuntu-components.install'
--- debian/qml-module-ubuntu-components.install	2016-03-04 11:58:12 +0000
+++ debian/qml-module-ubuntu-components.install	2016-07-26 08:38:05 +0000
@@ -17,6 +17,8 @@
 usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Styles/libUbuntuComponentsStyles.so
+usr/lib/*/qt5/qml/Ubuntu/Components/Styles/plugins.qmltypes
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Components/artwork
 usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so

=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2015-10-21 10:19:31 +0000
+++ documentation/overview.qdoc	2016-07-26 08:38:05 +0000
@@ -33,7 +33,7 @@
      \part Basic QML Types
      Available through:
      \code
-         import Ubuntu.Components 1.2
+         import Ubuntu.Components 1.3
      \endcode
      \annotatedlist ubuntu
 
@@ -51,7 +51,7 @@
 
      Available through:
      \code
-         import Ubuntu.Components 1.2
+         import Ubuntu.Components 1.3
      \endcode
      \annotatedlist ubuntu-listitem
 
@@ -60,21 +60,21 @@
 
      Available through:
      \code
-         import Ubuntu.Components.ListItems 1.0
+         import Ubuntu.Components.ListItems 1.3
      \endcode
      \annotatedlist ubuntu-listitems
 
      \part Pickers
      Available through:
      \code
-         import Ubuntu.Components.Pickers 1.0
+         import Ubuntu.Components.Pickers 1.3
      \endcode
      \annotatedlist ubuntu-pickers
 
      \part Popovers, Sheets and Dialogs
      Available through:
      \code
-         import Ubuntu.Components.Popups 1.0
+         import Ubuntu.Components.Popups 1.3
      \endcode
      \annotatedlist ubuntu-popups
 
@@ -88,14 +88,14 @@
      \part Theming Elements
      Available through:
      \code
-         import Ubuntu.Components 1.2
+         import Ubuntu.Components 1.3
      \endcode
      \annotatedlist theming
 
      \part Theme module
      Available through:
      \code
-         import Ubuntu.Components.Themes 1.0
+         import Ubuntu.Components.Themes 1.3
      \endcode
      \annotatedlist theme-module
 
@@ -104,28 +104,28 @@
      Themes must make sure that these interfaces are all implemented.
      Available through:
      \code
-         import Ubuntu.Components.Styles 1.2
+         import Ubuntu.Components.Styles 1.3
      \endcode
      \annotatedlist style-api
 
      \part Resolution Independence Items
      Available through:
      \code
-         import Ubuntu.Components 1.2
+         import Ubuntu.Components 1.3
      \endcode
      \annotatedlist resolution-independence
 
      \part Parsing Command-Line Arguments
      Available through:
      \code
-         import Ubuntu.Components 1.2
+         import Ubuntu.Components 1.3
      \endcode
      \annotatedlist ubuntu-commandline
 
      \part Services
      Available through:
      \code
-         import Ubuntu.Components 1.2
+         import Ubuntu.Components 1.3
      \endcode
      \annotatedlist ubuntu-services
 
@@ -139,7 +139,7 @@
      \part Test extensions
      Available through:
      \code
-         import Ubuntu Test 1.0
+         import Ubuntu Test 1.3
      \endcode
      \annotatedlist ubuntu-test
  */

=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2016-01-07 15:00:13 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2016-07-26 08:38:05 +0000
@@ -1,9 +1,15 @@
 project = UbuntuUserInterfaceToolkit
 url = http://developer.ubuntu.com/api/ubuntu-15.04/qml/mobile/
 description = Ubuntu User Interface Toolkit Documentation
+defines = Q_QDOC
 sourcedirs = ./
+headerdirs = ../include
 sourcedirs += ../src/Ubuntu/Components
-headerdirs = ../src/Ubuntu/Components/plugin
+headerdirs += ../src/Ubuntu/Components/plugin
+sourcedirs += ../src/Ubuntu/UbuntuToolkit
+headerdirs += ../src/Ubuntu/UbuntuToolkit
+sourcedirs += ../src/Ubuntu/UbuntuGestures
+headerdirs += ../src/Ubuntu/UbuntuGestures
 sourcedirs += ../src/Ubuntu/Layouts
 headerdirs += ../src/Ubuntu/Layouts/plugin
 sourcedirs += ../src/Ubuntu/PerformanceMetrics
@@ -27,6 +33,7 @@
 headers.fileextensions = "*.h"
 # exclude qml files that have the component documented in a separate qdoc file
 excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
+excludefiles += ../src/Ubuntu/UbuntuToolkit/asyncloader.cpp
 outputdir = $BLD/html
 outputformats = HTML
 version = 1.3

=== modified file 'export_qml_dir.sh'
--- export_qml_dir.sh	2016-06-13 10:44:46 +0000
+++ export_qml_dir.sh	2016-07-26 08:38:05 +0000
@@ -25,7 +25,7 @@
 export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
 UBUNTU_QML_ROOT=$BUILD_DIR/qml/Ubuntu
 UBUNTU_QML_DIRS=$UBUNTU_QML_ROOT/Components:$UBUNTU_QML_ROOT/Test:$UBUNTU_QML_ROOT/Layouts:$UBUNTU_QML_ROOT/PerformanceMetrics
-export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 # Build machines may not have initctl and don't need it
 test -f /sbin/initctl || return 0
 # initctl may be available but not working (for example in a lxd container without upstart)

=== modified file 'features/ubuntu_qml_plugin.prf'
--- features/ubuntu_qml_plugin.prf	2016-04-05 06:28:06 +0000
+++ features/ubuntu_qml_plugin.prf	2016-07-26 08:38:05 +0000
@@ -84,4 +84,5 @@
 
 #do not warn for deprecated declarations
 QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
+DEFINES -= QT_DEPRECATED_WARNINGS
 

=== modified file 'features/ubuntu_qt_module.prf'
--- features/ubuntu_qt_module.prf	2015-11-29 15:31:53 +0000
+++ features/ubuntu_qt_module.prf	2016-07-26 08:38:05 +0000
@@ -20,3 +20,4 @@
 
 #do not warn for deprecated declarations
 QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
+DEFINES -= QT_DEPRECATED_WARNINGS

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-06-09 10:38:03 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-07-26 08:38:05 +0000
@@ -728,7 +728,6 @@
         }
     }
 
-
     // Page holder component, can have only one Page as child at a time, all stacked pages
     // will be parented into hiddenPool
     Component {
@@ -774,8 +773,15 @@
                 onHeaderChanged: body.updateHeaderHeight(0)
             }
             Connections {
+                ignoreUnknownSignals: true
                 target: page ? page.header : null
-                onImplicitHeightChanged: body.updateHeaderHeight(page.header.implicitHeight)
+                onImplicitHeightChanged: {
+                    if (page.header.hasOwnProperty("automaticHeight") &&
+                            page.header.automaticHeight) {
+                        body.updateHeaderHeight(page.header.implicitHeight)
+                    }
+                }
+                onAutomaticHeightChanged: body.updateHeaderHeight(0)
             }
 
             // prevent the pages from taking the app header height into account.
@@ -797,8 +803,7 @@
                 }
             }
 
-            // subHeader is to be deprecated in UITK 1.4 and will be replaced
-            //  by the Page.header property (introduced in 1.3).
+            // FIXME: subHeader is deprecated and will be replaced by Page.header. See bug #1583587.
             property alias head: subHeader
             StyledItem {
                 id: subHeader
@@ -823,9 +828,12 @@
                 property PageHeadConfiguration config: null
                 property Item contents: null
 
-                property color dividerColor: layout.__propagated.header.dividerColor
-                property color panelColor: layout.__propagated.header.panelColor
-                property color backgroundColor: layout.__propagated.header.backgroundColor
+
+                property AppHeader appHeader: layout.__propagated && layout.__propagated.header ?
+                                                layout.__propagated.header : null
+                property color dividerColor: appHeader ? appHeader.dividerColor : "black"
+                property color panelColor: appHeader ? appHeader.panelColor : "grey"
+                property color backgroundColor: appHeader ? appHeader.backgroundColor : "white"
 
                 // Enable red outline in the PageHeadStyle. See bug #1583636.
                 property bool showDeprecatedWarning: true
@@ -976,7 +984,10 @@
                 for (i = 0; i < children.length; i++) {
                     page = children[i].page;
                     if (page && page.hasOwnProperty("header") && page.header) {
-                        subHeight = page.header.implicitHeight;
+                        if (page.header.hasOwnProperty("automaticHeight") &&
+                                page.header.automaticHeight) {
+                            subHeight = page.header.implicitHeight;
+                        }
                     } else {
                         subHeight = children[i].head.preferredHeight;
                     }
@@ -985,10 +996,12 @@
                 body.headerHeight = h;
             }
 
-            // Update all the Page.header heights.
+            // Update the Page.header heights.
             for (i = 0; i < body.children.length; i++) {
                 page = body.children[i].page;
-                if (page && page.hasOwnProperty("header") && page.header) {
+                if (page && page.hasOwnProperty("header") && page.header &&
+                        page.header.hasOwnProperty("automaticHeight") &&
+                        page.header.automaticHeight) {
                     page.header.height = headerHeight;
                 }
             }

=== modified file 'src/Ubuntu/Components/1.3/Icon.qml'
--- src/Ubuntu/Components/1.3/Icon.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/Icon.qml	2016-07-26 08:38:05 +0000
@@ -110,6 +110,8 @@
     implicitWidth: image.implicitWidth
     implicitHeight: image.implicitHeight
 
+    Component.onCompleted: image.completed = true
+
     Image {
         id: image
         objectName: "image"
@@ -121,7 +123,8 @@
             height: icon.height
         }
 
-        source: icon.name ? "image://theme/%1".arg(icon.name) : ""
+        property bool completed: false
+        source: completed && icon.name ? "image://theme/%1".arg(icon.name) : ""
 
         cache: true
         visible: !colorizedImage.visible

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2016-06-06 13:36:35 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-07-26 08:38:05 +0000
@@ -400,9 +400,9 @@
 
     /*!
       Whether the TextArea should keep the selection visible when it loses active
-      focus to another item in the scene. By default this is set to true;
+      focus to another item in the scene. By default this is set to true.
 
-      \qmlproperty enumeration persistentSelection
+      \qmlproperty bool persistentSelection
       */
     property alias persistentSelection: editor.persistentSelection
 
@@ -849,6 +849,7 @@
             height: Math.max(control.contentHeight, editor.contentHeight)
             wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
             mouseSelectionMode: TextEdit.SelectWords
+            persistentSelection: true
             selectByMouse: true
             cursorDelegate: TextCursor {
                 handler: inputHandler

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-07-26 08:38:05 +0000
@@ -1030,6 +1030,7 @@
 
             // overrides
             selectByMouse: true
+            persistentSelection: false
 
             // input selection and navigation handling
             Ubuntu.Mouse.forwardTo: [inputHandler]

=== modified file 'src/Ubuntu/Components/Components.pro'
--- src/Ubuntu/Components/Components.pro	2015-05-18 09:53:55 +0000
+++ src/Ubuntu/Components/Components.pro	2016-07-26 08:38:05 +0000
@@ -5,4 +5,5 @@
            Pickers   \
            Popups    \
            Styles    \
-           Themes
+           Themes    \
+           Labs

=== added directory 'src/Ubuntu/Components/Labs'
=== added file 'src/Ubuntu/Components/Labs/Labs.pro'
--- src/Ubuntu/Components/Labs/Labs.pro	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Labs/Labs.pro	2016-07-26 08:38:05 +0000
@@ -0,0 +1,10 @@
+CXX_MODULE = qml
+TARGET  = UbuntuComponentsLabs
+TARGETPATH = Ubuntu/Components/Labs
+IMPORT_VERSION = 1.0
+
+include(plugin/plugin.pri)
+
+load(ubuntu_qml_plugin)
+
+OTHER_FILES+=qmldir

=== added directory 'src/Ubuntu/Components/Labs/plugin'
=== added file 'src/Ubuntu/Components/Labs/plugin/plugin.cpp'
--- src/Ubuntu/Components/Labs/plugin/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Labs/plugin/plugin.cpp	2016-07-26 08:38:05 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include <QtQml/QQmlExtensionPlugin>
+#include <ubuntutoolkitmodule.h>
+
+class UbuntuComponentsLabsPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+
+public:
+    void registerTypes(const char *uri) override
+    {
+        Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Labs"));
+        UT_PREPEND_NAMESPACE(UbuntuLabsModule)::defineModule(uri);
+    }
+
+    void initializeEngine(QQmlEngine *engine, const char *uri) override
+    {
+        UT_PREPEND_NAMESPACE(UbuntuLabsModule)::initializeModule(engine, this);
+        QQmlExtensionPlugin::initializeEngine(engine, uri);
+    }
+
+    ~UbuntuComponentsLabsPlugin()
+    {
+        UT_PREPEND_NAMESPACE(UbuntuLabsModule)::undefineModule();
+    }
+};
+
+#include "plugin.moc"
+

=== added file 'src/Ubuntu/Components/Labs/plugin/plugin.pri'
--- src/Ubuntu/Components/Labs/plugin/plugin.pri	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Labs/plugin/plugin.pri	2016-07-26 08:38:05 +0000
@@ -0,0 +1,8 @@
+QT *= qml quick UbuntuToolkit UbuntuToolkit_private
+
+CONFIG += no_keywords c++11
+
+INCLUDEPATH+=$$PWD
+
+SOURCES += \
+    $$PWD/plugin.cpp

=== added file 'src/Ubuntu/Components/Labs/qmldir'
--- src/Ubuntu/Components/Labs/qmldir	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Labs/qmldir	2016-07-26 08:38:05 +0000
@@ -0,0 +1,3 @@
+module Ubuntu.Components.Labs
+plugin UbuntuComponentsLabs
+typeinfo plugins.qmltypes

=== modified file 'src/Ubuntu/Components/Styles/Styles.pro'
--- src/Ubuntu/Components/Styles/Styles.pro	2016-06-14 10:08:13 +0000
+++ src/Ubuntu/Components/Styles/Styles.pro	2016-07-26 08:38:05 +0000
@@ -1,4 +1,9 @@
+CXX_MODULE = qml
+TARGET  = UbuntuComponentsStyles
 TARGETPATH = Ubuntu/Components/Styles
+IMPORT_VERSION = 1.1
+
+include(plugin/plugin.pri)
 
 QML_FILES += 1.2/ComboButtonStyle.qml \
              1.2/PageHeadStyle.qml \
@@ -9,6 +14,6 @@
 	     1.3/ToolbarStyle.qml \
 	     1.3/SectionsStyle.qml \
 
-load(ubuntu_qml_module)
+load(ubuntu_qml_plugin)
 
 OTHER_FILES+=qmldir

=== added directory 'src/Ubuntu/Components/Styles/plugin'
=== added file 'src/Ubuntu/Components/Styles/plugin/plugin.cpp'
--- src/Ubuntu/Components/Styles/plugin/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Styles/plugin/plugin.cpp	2016-07-26 08:38:05 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include <QtQml/QQmlExtensionPlugin>
+#include <ubuntutoolkitmodule.h>
+
+class UbuntuComponentsStylesPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+
+public:
+    void registerTypes(const char *uri) override
+    {
+        Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Styles"));
+        UT_PREPEND_NAMESPACE(UbuntuStylesModule)::defineModule(uri);
+    }
+
+    ~UbuntuComponentsStylesPlugin()
+    {
+        UT_PREPEND_NAMESPACE(UbuntuStylesModule)::undefineModule();
+    }
+};
+
+#include "plugin.moc"

=== added file 'src/Ubuntu/Components/Styles/plugin/plugin.pri'
--- src/Ubuntu/Components/Styles/plugin/plugin.pri	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Styles/plugin/plugin.pri	2016-07-26 08:38:05 +0000
@@ -0,0 +1,8 @@
+QT *= qml quick UbuntuToolkit UbuntuToolkit_private
+
+CONFIG += no_keywords c++11
+
+INCLUDEPATH+=$$PWD
+
+SOURCES += \
+    $$PWD/plugin.cpp

=== modified file 'src/Ubuntu/Components/Styles/qmldir'
--- src/Ubuntu/Components/Styles/qmldir	2016-06-13 15:57:20 +0000
+++ src/Ubuntu/Components/Styles/qmldir	2016-07-26 08:38:05 +0000
@@ -1,4 +1,6 @@
 module Ubuntu.Components.Styles
+plugin UbuntuComponentsStyles
+typeinfo plugins.qmltypes
 ComboButtonStyle 1.1 1.2/ComboButtonStyle.qml
 PullToRefreshStyle 1.1 1.2/PullToRefreshStyle.qml
 PageHeadStyle 1.1 1.2/PageHeadStyle.qml

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml	2015-04-24 14:52:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml	2016-07-26 08:38:05 +0000
@@ -27,7 +27,7 @@
 
     Image {
         id: progressIcon
-        source: progressionIconSource
+        source: visible ? progressionIconSource : ""
         anchors {
             verticalCenter: parent.verticalCenter
             right: parent.right
@@ -46,7 +46,7 @@
             right: progressIcon.left
             rightMargin: styledItem.splitMargin
         }
-        source: progressionDividerSource
+        source: visible ? progressionDividerSource : ""
         opacity: enabled ? 1.0 : 0.5
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml	2015-04-25 07:36:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml	2016-07-26 08:38:05 +0000
@@ -46,7 +46,7 @@
             right: progressIcon.left
             rightMargin: styledItem.splitMargin
         }
-        source: progressionDividerSource
+        source: visible ? progressionDividerSource : ""
         opacity: enabled ? 1.0 : 0.5
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2016-04-22 03:43:33 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2016-07-26 08:38:05 +0000
@@ -939,7 +939,8 @@
                         anchors.centerIn: parent
                         width: __stepperAssetWidth
                         rotation: isVertical ? 180 : 90
-                        source: Qt.resolvedUrl("../artwork/toolkit_scrollbar-stepper.svg")
+                        source: visible ? Qt.resolvedUrl("../artwork/toolkit_scrollbar-stepper.svg") : ""
+                        asynchronous: true
                         color: Qt.rgba(sliderColor.r, sliderColor.g, sliderColor.b,
                                        sliderColor.a * ((flickableItem && flickableItem[scrollbarUtils.propAtBeginning])
                                                         ? __stepperImgOpacityDisabled
@@ -982,7 +983,8 @@
                         anchors.centerIn: parent
                         width: __stepperAssetWidth
                         rotation: isVertical ? 0 : -90
-                        source: Qt.resolvedUrl("../artwork/toolkit_scrollbar-stepper.svg")
+                        source: visible ? Qt.resolvedUrl("../artwork/toolkit_scrollbar-stepper.svg") : ""
+                        asynchronous: true
                         color: Qt.rgba(sliderColor.r, sliderColor.g, sliderColor.b,
                                        sliderColor.a * ((flickableItem && flickableItem[scrollbarUtils.propAtEnd])
                                                         ? __stepperImgOpacityDisabled

=== removed directory 'src/Ubuntu/Components/plugin/gestures'
=== removed file 'src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp'
--- src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp	2015-10-21 07:34:54 +0000
+++ src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "CandidateInactivityTimer.h"
-
-namespace UbuntuGestures {
-
-CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
-        AbstractTimer *timer, QObject *parent)
-    : QObject(parent)
-    , m_timer(timer)
-    , m_touchId(touchId)
-    , m_candidate(candidate)
-{
-    connect(m_timer, &AbstractTimer::timeout,
-            this, &CandidateInactivityTimer::onTimeout);
-    m_timer->setInterval(durationMs);
-    m_timer->setSingleShot(true);
-    m_timer->start();
-}
-
-CandidateInactivityTimer::~CandidateInactivityTimer()
-{
-    delete m_timer;
-}
-
-void CandidateInactivityTimer::onTimeout()
-{
-    qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);
-    Q_EMIT candidateDefaulted(m_touchId, m_candidate);
-}
-
-} // namespace UbuntuGestures

=== removed file 'src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h'
--- src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h	2015-10-21 07:34:54 +0000
+++ src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * 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/>.
- *
- */
-
-#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
-#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
-
-#include <QtCore/QObject>
-
-class QQuickItem;
-
-#include "Timer.h"
-
-namespace UbuntuGestures {
-
-class UBUNTUGESTURESQML_EXPORT CandidateInactivityTimer : public QObject {
-    Q_OBJECT
-public:
-    CandidateInactivityTimer(int touchId, QQuickItem *candidate,
-                             AbstractTimer *timer,
-                             QObject *parent = Q_NULLPTR);
-
-    virtual ~CandidateInactivityTimer();
-
-    const int durationMs = 1000;
-
-Q_SIGNALS:
-    void candidateDefaulted(int touchId, QQuickItem *candidate);
-private Q_SLOTS:
-    void onTimeout();
-private:
-    AbstractTimer *m_timer;
-    int m_touchId;
-    QQuickItem *m_candidate;
-};
-
-} // namespace UbuntuGestures
-
-#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

=== removed file 'src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h'
--- src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h	2015-10-21 07:34:54 +0000
+++ src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * 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/>.
- *
- */
-
-#include <QtCore/QtGlobal>
-
-#if defined(UBUNTUGESTURESQML_LIBRARY)
-#  define UBUNTUGESTURESQML_EXPORT Q_DECL_EXPORT
-#else
-#  define UBUNTUGESTURESQML_EXPORT Q_DECL_IMPORT
-#endif

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-07-26 08:38:05 +0000
@@ -15,316 +15,32 @@
  *
  */
 
-#include <QtQuick/private/qquickimagebase_p.h>
-#include <QDBusConnection>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QScreen>
-
+#include <QtQml/QQmlEngine>
 #include "plugin.h"
-#include "uctheme.h"
-#include "ucdeprecatedtheme.h"
-#include "ucthemingextension.h"
-
-#include <QtQml/QQmlContext>
-#include "i18n.h"
-#include "listener.h"
-#include "livetimer.h"
-#include "ucunits.h"
-#include "ucscalingimageprovider.h"
-#include "ucqquickimageextension.h"
-#include "quickutils.h"
-#include "ucubuntushape.h"
-#include "ucubuntushapeoverlay.h"
-#include "ucproportionalshape.h"
-#include "inversemouseareatype.h"
-#include "qquickclipboard.h"
-#include "qquickmimedata.h"
-#include "ucubuntuanimation.h"
-#include "ucfontutils.h"
-#include "ucarguments.h"
-#include "ucargument.h"
-#include "ucapplication.h"
-#include "ucalarm.h"
-#include "ucalarmmodel.h"
-#include "unitythemeiconprovider.h"
-#include "ucstatesaver.h"
-#include "ucurihandler.h"
-#include "ucmouse.h"
-#include "ucinversemouse.h"
-#include "sortfiltermodel.h"
-#include "ucstyleditembase.h"
-#include "ucstylehints.h"
-#include "ucaction.h"
-#include "ucactioncontext.h"
-#include "ucactionmanager.h"
-#include "uclistitem.h"
-#include "uclistitem_p.h"
-#include "uclistitemactions.h"
-#include "uclistitemstyle.h"
-#include "ucserviceproperties.h"
 #include "ucnamespace.h"
-#include "ucslotslayout.h"
-#include "ucactionitem.h"
-#include "uchaptics.h"
-#include "ucabstractbutton.h"
-#include "ucheader.h"
-#include "uclabel.h"
-#include "uclistitemlayout.h"
-#include "ucbottomedgehint.h"
-#include "ucmathutils.h"
-#include "ucbottomedge.h"
-#include "ucbottomedgeregion.h"
-#include "ucbottomedgestyle.h"
-#include "ucpagetreenode.h"
-#include "ucmainviewbase.h"
-#include "ucperformancemonitor.h"
-#include "privates/frame.h"
-#include "privates/ucpagewrapper.h"
-#include "privates/appheaderbase.h"
-
-// From UbuntuGestures
-#include "private/ucswipearea_p.h"
-
-//From UbuntuToolkit
-#include <ColorUtils>
-#include <Tree>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdexcept>
-
-QUrl UbuntuComponentsPlugin::m_baseUrl = QUrl();
-
-/*
- * Type registration functions.
- */
-
-template<typename T> static QObject *qmlRegisterSimpleSingletonTypeCallback(QQmlEngine *, QJSEngine *)
-{
-    return (new T);
-}
-
-template<typename T> static int qmlRegisterSimpleSingletonType(const char *uri, int major, int minor, const char *typeName)
-{
-    return qmlRegisterSingletonType<T>(uri, major, minor, typeName, qmlRegisterSimpleSingletonTypeCallback<T>);
-}
-
-void UbuntuComponentsPlugin::initializeBaseUrl()
-{
-    if (!m_baseUrl.isValid()) {
-        m_baseUrl = QUrl(baseUrl().toString() + '/');
-    }
-}
-
-void UbuntuComponentsPlugin::registerWindowContextProperty()
-{
-    setWindowContextProperty(QGuiApplication::focusWindow());
-
-    // listen to QGuiApplication::focusWindowChanged
-    /* Ensure that setWindowContextProperty is called in the same thread (the
-       main thread) otherwise it segfaults. Reference:
-       https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205556
-    */
-    QGuiApplication* application = static_cast<QGuiApplication*>(QCoreApplication::instance());
-    QObject::connect(application, SIGNAL(focusWindowChanged(QWindow*)),
-                     this, SLOT(setWindowContextProperty(QWindow*)),
-                     Qt::ConnectionType(Qt::DirectConnection | Qt::UniqueConnection));
-
-}
-
-void UbuntuComponentsPlugin::setWindowContextProperty(QWindow* focusWindow)
-{
-    QQuickView* view = qobject_cast<QQuickView*>(focusWindow);
-
-    if (view != NULL) {
-        view->rootContext()->setContextProperty("window", view);
-    }
-}
-
-void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor)
-{
-    qmlRegisterType<UCAction>(uri, major, minor, "Action");
-    qmlRegisterType<UCActionContext>(uri, major, minor, "ActionContext");
-    qmlRegisterUncreatableType<UCApplication>(uri, major, minor, "UCApplication", "Not instantiable");
-    qmlRegisterType<UCActionManager>(uri, major, minor, "ActionManager");
-    qmlRegisterUncreatableType<UCFontUtils>(uri, major, minor, "UCFontUtils", "Not instantiable");
-    qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItem");
-    qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
-    qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
-    qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
-    qmlRegisterType<UCUbuntuShape>(uri, major, minor, "UbuntuShape");
-    // FIXME/DEPRECATED: Shape is exported for backwards compatibility only
-    qmlRegisterType<UCUbuntuShape>(uri, major, minor, "Shape");
-    qmlRegisterType<InverseMouseAreaType>(uri, major, minor, "InverseMouseArea");
-    qmlRegisterType<QQuickMimeData>(uri, major, minor, "MimeData");
-    qmlRegisterSimpleSingletonType<QQuickClipboard>(uri, major, minor, "Clipboard");
-    qmlRegisterSimpleSingletonType<UCUbuntuAnimation>(uri, major, minor, "UbuntuAnimation");
-    qmlRegisterType<UCArguments>(uri, major, minor, "Arguments");
-    qmlRegisterType<UCArgument>(uri, major, minor, "Argument");
-    qmlRegisterType<QQmlPropertyMap>();
-    qmlRegisterType<UCAlarm>(uri, major, minor, "Alarm");
-    qmlRegisterType<UCAlarmModel>(uri, major, minor, "AlarmModel");
-    qmlRegisterType<UCStateSaver>(uri, major, minor, "StateSaver");
-    qmlRegisterType<UCStateSaverAttached>();
-    qmlRegisterSimpleSingletonType<UCUriHandler>(uri, major, minor, "UriHandler");
-    qmlRegisterType<UCMouse>(uri, major, minor, "Mouse");
-    qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
-    qmlRegisterType<UCActionItem>(uri, major, minor, "ActionItem");
-    qmlRegisterSimpleSingletonType<UCHaptics>(uri, major, minor, "Haptics");
-    qmlRegisterSimpleSingletonType<UCMathUtils>(uri, major, minor, "MathUtils");
-    qmlRegisterSimpleSingletonType<UbuntuToolkit::ColorUtils>(uri, major, minor, "ColorUtils");
+#include <ubuntutoolkitmodule.h>
+#include <ubuntugesturesmodule.h>
+
+UbuntuComponentsPlugin::~UbuntuComponentsPlugin()
+{
+    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::undefineModule();
+    UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::undefineModule();
 }
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.Components"));
-    initializeBaseUrl();
-
-    // register 0.1 for backward compatibility
-    registerTypesToVersion(uri, 0, 1);
-    registerTypesToVersion(uri, 1, 0);
-
-    // register custom event
-    ForwardedEvent::registerForwardedEvent();
-
-    // register parent type so that properties can get/ set it
-    qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "QAbstractItemModel", "Not instantiable");
-
-    // register 1.1 only API
-    qmlRegisterType<UCStyledItemBase, 1>(uri, 1, 1, "StyledItem");
-    qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
-    qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
-    qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
-    qmlRegisterType<UCServiceProperties, 1>(uri, 1, 1, "ServiceProperties");
-
-    // register 1.2 only API
-    qmlRegisterType<UCListItem>(uri, 1, 2, "ListItem");
-    qmlRegisterType<UCListItemDivider>();
-    qmlRegisterUncreatableType<UCSwipeEvent>(uri, 1, 2, "SwipeEvent", "This is an event object.");
-    qmlRegisterUncreatableType<UCDragEvent>(uri, 1, 2, "ListItemDrag", "This is an event object");
-    qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions");
-    qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable");
-    qmlRegisterSimpleSingletonType<UCNamespace>(uri, 1, 2, "Ubuntu");
-    qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape");
-    qmlRegisterType<UCUbuntuShapeOverlay>(uri, 1, 2, "UbuntuShapeOverlay");
-
-    // register 1.3 API
-    qmlRegisterType<UCListItem, 1>(uri, 1, 3, "ListItem");
-    qmlRegisterType<UCListItemExpansion>();
-    qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
-    qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
-    qmlRegisterSimpleSingletonType<UCNamespaceV13>(uri, 1, 3, "Ubuntu");
-    qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
-    qmlRegisterCustomType<UCStyleHints>(uri, 1, 3, "StyleHints", new UCStyleHintsParser);
-    qmlRegisterType<UCAction, 1>(uri, 1, 3, "Action");
-    qmlRegisterType<UCSlotsLayout>(uri, 1, 3, "SlotsLayout");
-    qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
-    qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
-    qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
-    qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
-    qmlRegisterType<UCMargins>();
-    qmlRegisterUncreatableType<UCSlotsAttached>(uri, 1, 3, "SlotsAttached", "Not instantiable");
-    qmlRegisterUncreatableType<UCSlotsLayoutPadding>(uri, 1, 3, "SlotsLayoutPadding", "Not instantiable");
-    qmlRegisterType<UCListItemLayout>(uri, 1, 3, "ListItemLayout");
-    qmlRegisterType<UCHeader>(uri, 1, 3, "Header");
-    qmlRegisterType<UCLabel>(uri, 1, 3, "Label");
-    qmlRegisterType<UCBottomEdgeHint>(uri, 1, 3, "BottomEdgeHint");
-    qmlRegisterType<UCSwipeArea>(uri, 1, 3, "SwipeArea");
-    qmlRegisterType<UCBottomEdge>(uri, 1, 3, "BottomEdge");
-    qmlRegisterType<UCBottomEdgeRegion>(uri, 1, 3, "BottomEdgeRegion");
-    qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
-    qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
-    qmlRegisterType<UCMainViewBase>(uri, 1, 3, "MainViewBase");
-}
-
-void UbuntuComponentsPlugin::initializeContextProperties(QQmlEngine *engine)
-{
-    UCUnits::instance(engine);
-    QuickUtils::instance(engine);
-    UbuntuI18n::instance(engine);
-    UCApplication::instance(engine);
-    UCFontUtils::instance(engine);
-    UCTheme::defaultTheme(engine);
-
-    QQmlContext* context = engine->rootContext();
-
-    // register root object watcher that sets a global property with the root object
-    // that can be accessed from any object
-    context->setContextProperty("QuickUtils", QuickUtils::instance());
-
-    UCDeprecatedTheme::registerToContext(context);
-
-    context->setContextProperty("i18n", UbuntuI18n::instance());
-    ContextPropertyChangeListener *i18nChangeListener =
-        new ContextPropertyChangeListener(context, "i18n");
-    QObject::connect(UbuntuI18n::instance(), SIGNAL(domainChanged()),
-                     i18nChangeListener, SLOT(updateContextProperty()));
-    QObject::connect(UbuntuI18n::instance(), SIGNAL(languageChanged()),
-                     i18nChangeListener, SLOT(updateContextProperty()));
-
-    // We can't use 'Application' because it exists (undocumented)
-    context->setContextProperty("UbuntuApplication", UCApplication::instance());
-    ContextPropertyChangeListener *applicationChangeListener =
-        new ContextPropertyChangeListener(context, "UbuntuApplication");
-    QObject::connect(UCApplication::instance(), SIGNAL(applicationNameChanged()),
-                     applicationChangeListener, SLOT(updateContextProperty()));
-    // Give the application object access to the engine
-    UCApplication::instance()->setContext(context);
-
-    context->setContextProperty("units", UCUnits::instance());
-    ContextPropertyChangeListener *unitsChangeListener =
-        new ContextPropertyChangeListener(context, "units");
-    QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
-                     unitsChangeListener, SLOT(updateContextProperty()));
-
-    // register FontUtils
-    context->setContextProperty("FontUtils", UCFontUtils::instance());
-    ContextPropertyChangeListener *fontUtilsListener =
-        new ContextPropertyChangeListener(context, "FontUtils");
-    QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
-                     fontUtilsListener, SLOT(updateContextProperty()));
-
+    Q_UNUSED(uri);
+
+    qmlRegisterSimpleSingletonType<UT_PREPEND_NAMESPACE(UCNamespace)>(uri, 1, 2, "Ubuntu");
+    qmlRegisterSimpleSingletonType<UT_PREPEND_NAMESPACE(UCNamespaceV13)>(uri, 1, 3, "Ubuntu");
+
+    UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::defineModule(uri);
+    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::defineModule();
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
-    // initialize baseURL
-    initializeBaseUrl();
-
-    // register internal styles
-    const char *styleUri = "Ubuntu.Components.Styles";
-    qmlRegisterType<UCListItemStyle>(styleUri, 1, 2, "ListItemStyle");
-    qmlRegisterType<UCListItemStyle, 1>(styleUri, 1, 3, "ListItemStyle");
-    qmlRegisterType<UCBottomEdgeStyle>(styleUri, 1, 3, "BottomEdgeStyle");
-
-    // Register private types.
-    const char *privateUri = "Ubuntu.Components.Private";
-    qmlRegisterType<UCFrame>(privateUri, 1, 3, "Frame");
-    qmlRegisterType<UCPageWrapper>(privateUri, 1, 3, "PageWrapper");
-    qmlRegisterType<UCAppHeaderBase>(privateUri, 1, 3, "AppHeaderBase");
-    qmlRegisterType<UbuntuToolkit::Tree>(privateUri, 1, 3, "Tree");
-
+    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::initializeModule(engine, baseUrl());
     QQmlExtensionPlugin::initializeEngine(engine, uri);
-
-    // allocate all context property objects prior we register them
-    initializeContextProperties(engine);
-
-    HapticsProxy::instance(engine);
-
-    engine->addImageProvider(QLatin1String("scaling"), new UCScalingImageProvider);
-
-    // register icon provider
-    engine->addImageProvider(QLatin1String("theme"), new UnityThemeIconProvider);
-
-    // Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
-    QGuiApplication::primaryScreen()->setOrientationUpdateMask(
-            Qt::PortraitOrientation |
-            Qt::LandscapeOrientation |
-            Qt::InvertedPortraitOrientation |
-            Qt::InvertedLandscapeOrientation);
-
-    registerWindowContextProperty();
-
-    // register performance monitor
-    engine->rootContext()->setContextProperty("performanceMonitor", new UCPerformanceMonitor(engine));
 }

=== modified file 'src/Ubuntu/Components/plugin/plugin.h'
--- src/Ubuntu/Components/plugin/plugin.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/Components/plugin/plugin.h	2016-07-26 08:38:05 +0000
@@ -21,8 +21,7 @@
 
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
-
-class QWindow;
+#include <ubuntutoolkitglobal.h>
 
 class UbuntuComponentsPlugin : public QQmlExtensionPlugin
 {
@@ -30,22 +29,10 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
+    ~UbuntuComponentsPlugin();
     void registerTypes(const char *uri) override;
     void initializeEngine(QQmlEngine *engine, const char *uri) override;
-    static const QUrl &pluginUrl()
-    {
-        return m_baseUrl;
-    }
-    static void initializeContextProperties(QQmlEngine*);
-
-private Q_SLOTS:
-    void registerWindowContextProperty();
-    void setWindowContextProperty(QWindow* focusWindow);
-
-private:
-    static QUrl m_baseUrl;
-    void initializeBaseUrl();
-    void registerTypesToVersion(const char *uri, int major, int minor);
+
 };
+
 #endif // UBUNTU_COMPONENTS_PLUGIN_H
-

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2016-06-02 12:50:02 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-07-26 08:38:05 +0000
@@ -1,9 +1,5 @@
-unix {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += gio-2.0 dbus-1 libnih-dbus
-}
-
-QT *= core-private qml qml-private quick quick-private gui-private dbus svg UbuntuGestures UbuntuGestures_private UbuntuToolkit
+QT *= core-private qml qml-private quick quick-private gui-private dbus svg \
+      UbuntuGestures UbuntuGestures_private UbuntuToolkit UbuntuToolkit_private
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT += v8-private
@@ -11,201 +7,10 @@
 
 CONFIG += no_keywords c++11
 
-# QOrganizer
-QT *= organizer
-
-#comment in the following line to disable traces
-#DEFINES += QT_NO_DEBUG_OUTPUT
-DEFINES += QT_USE_QSTRINGBUILDER
-
 INCLUDEPATH+=$$PWD
 
 HEADERS += $$PWD/plugin.h \
-    $$PWD/uctheme.h \
-    $$PWD/i18n.h \
-    $$PWD/listener.h \
-    $$PWD/ucscalingimageprovider.h \
-    $$PWD/ucunits.h \
-    $$PWD/ucqquickimageextension.h \
-    $$PWD/quickutils.h \
-    $$PWD/ucubuntushapetexture.h \
-    $$PWD/ucubuntushape.h \
-    $$PWD/ucubuntushapeoverlay.h \
-    $$PWD/ucproportionalshape.h \
-    $$PWD/inversemouseareatype.h \
-    $$PWD/qquickclipboard.h \
-    $$PWD/qquickmimedata.h \
-    $$PWD/qquickclipboard_p.h \
-    $$PWD/ucubuntuanimation.h \
-    $$PWD/ucfontutils.h \
-    $$PWD/ucapplication.h \
-    $$PWD/ucarguments.h \
-    $$PWD/ucargument.h \
-    $$PWD/ucalarm.h \
-    $$PWD/ucalarm_p.h \
-    $$PWD/alarmmanager_p_p.h \
-    $$PWD/alarmmanager_p.h \
-    $$PWD/ucalarmmodel.h \
-    $$PWD/unitythemeiconprovider.h \
-    $$PWD/adapters/alarmsadapter_p.h \
-    $$PWD/ucstatesaver.h \
-    $$PWD/sortbehavior.h \
-    $$PWD/filterbehavior.h \
-    $$PWD/sortfiltermodel.h \
-    $$PWD/statesaverbackend_p.h \
-    $$PWD/ucstatesaver_p.h \
-    $$PWD/ucurihandler.h \
-    $$PWD/ucinversemouse.h \
-    $$PWD/ucmouse.h \
-    $$PWD/unixsignalhandler_p.h \
-    $$PWD/ucstyleditembase.h \
-    $$PWD/ucstyleditembase_p.h \
-    $$PWD/ucaction.h \
-    $$PWD/ucactioncontext.h \
-    $$PWD/ucactionmanager.h \
-    $$PWD/adapters/actionsproxy_p.h \
-    $$PWD/adapters/dbuspropertywatcher_p.h \
-    $$PWD/uclistitem.h \
-    $$PWD/uclistitem_p.h \
-    $$PWD/uclistitemactions.h \
-    $$PWD/uclistitemactions_p.h \
-    $$PWD/uclistitemstyle.h \
-    $$PWD/ucserviceproperties.h \
-    $$PWD/ucserviceproperties_p.h \
-    $$PWD/privates/listitemdragarea.h \
-    $$PWD/privates/listitemdraghandler.h \
-    $$PWD/privates/listitemselection.h \
-    $$PWD/ucnamespace.h \
-    $$PWD/ucdeprecatedtheme.h \
-    $$PWD/ucdefaulttheme.h \
-    $$PWD/ucstylehints.h \
-    $$PWD/ucslotslayout.h \
-    $$PWD/ucslotslayout_p.h \
-    $$PWD/livetimer.h \
-    $$PWD/livetimer_p.h \
-    $$PWD/timeutils_p.h \
-    $$PWD/ucactionitem.h \
-    $$PWD/ucactionitem_p.h \
-    $$PWD/uchaptics.h \
-    $$PWD/ucabstractbutton.h \
-    $$PWD/ucabstractbutton_p.h \
-    $$PWD/ucmargins.h \
-    $$PWD/ucthemingextension.h \
-    $$PWD/ucheader.h \
-    $$PWD/uclabel.h \
-    $$PWD/uclistitemlayout.h \
-    $$PWD/privates/threelabelsslot_p.h \
-    $$PWD/ucimportversionchecker_p.h \
-    $$PWD/ucbottomedgehint.h \
-    $$PWD/ucbottomedgehint_p.h \
-    $$PWD/gestures/ubuntugesturesqmlglobal.h \
-    $$PWD/ucmathutils.h \
-    $$PWD/ucbottomedge.h \
-    $$PWD/ucbottomedge_p.h \
-    $$PWD/ucbottomedgestyle.h \
-    $$PWD/ucbottomedgeregion.h \
-    $$PWD/ucpagetreenode.h \
-    $$PWD/ucpagetreenode_p.h \
-    $$PWD/ucmainviewbase.h \
-    $$PWD/ucmainviewbase_p.h \
-    $$PWD/ucperformancemonitor.h \
-    $$PWD/privates/listviewextensions.h \
-    $$PWD/privates/frame.h \
-    $$PWD/privates/ucpagewrapper.h \
-    $$PWD/privates/ucpagewrapper_p.h \
-    $$PWD/privates/ucpagewrapperincubator_p.h \
-    $$PWD/privates/appheaderbase.h \
-    $$PWD/label_p.h \
-    $$PWD/ucbottomedgeregion_p.h
+    $$PWD/ucnamespace.h
 
 SOURCES += $$PWD/plugin.cpp \
-    $$PWD/uctheme.cpp \
-    $$PWD/i18n.cpp \
-    $$PWD/listener.cpp \
-    $$PWD/ucscalingimageprovider.cpp \
-    $$PWD/ucunits.cpp \
-    $$PWD/ucqquickimageextension.cpp \
-    $$PWD/quickutils.cpp \
-    $$PWD/ucubuntushape.cpp \
-    $$PWD/ucubuntushapeoverlay.cpp \
-    $$PWD/ucproportionalshape.cpp \
-    $$PWD/inversemouseareatype.cpp \
-    $$PWD/qquickclipboard.cpp \
-    $$PWD/qquickmimedata.cpp \
-    $$PWD/ucubuntuanimation.cpp \
-    $$PWD/ucfontutils.cpp \
-    $$PWD/ucapplication.cpp \
-    $$PWD/ucarguments.cpp \
-    $$PWD/ucargument.cpp \
-    $$PWD/ucalarm.cpp \
-    $$PWD/alarmmanager_p.cpp \
-    $$PWD/ucalarmmodel.cpp \
-    $$PWD/unitythemeiconprovider.cpp \
-    $$PWD/ucstatesaver.cpp \
-    $$PWD/sortbehavior.cpp \
-    $$PWD/filterbehavior.cpp \
-    $$PWD/sortfiltermodel.cpp \
-    $$PWD/statesaverbackend_p.cpp \
-    $$PWD/ucurihandler.cpp \
-    $$PWD/ucmousefilters.cpp \
-    $$PWD/unixsignalhandler_p.cpp \
-    $$PWD/ucstyleditembase.cpp \
-    $$PWD/ucaction.cpp \
-    $$PWD/ucactioncontext.cpp \
-    $$PWD/ucactionmanager.cpp \
-    $$PWD/adapters/actionsproxy_p.cpp \
-    $$PWD/adapters/dbuspropertywatcher_p.cpp \
-    $$PWD/uclistitem.cpp \
-    $$PWD/uclistitemactions.cpp \
-    $$PWD/uclistitemstyle.cpp \
-    $$PWD/ucviewitemsattached.cpp \
-    $$PWD/ucserviceproperties.cpp \
-    $$PWD/privates/listitemdragarea.cpp \
-    $$PWD/privates/listitemdraghandler.cpp \
-    $$PWD/privates/listitemexpansion.cpp \
-    $$PWD/privates/listitemselection.cpp \
-    $$PWD/ucnamespace.cpp \
-    $$PWD/ucdeprecatedtheme.cpp \
-    $$PWD/ucdefaulttheme.cpp \
-    $$PWD/ucstylehints.cpp \
-    $$PWD/ucslotslayout.cpp \
-    $$PWD/livetimer.cpp \
-    $$PWD/livetimer_p.cpp \
-    $$PWD/ucactionitem.cpp \
-    $$PWD/uchaptics.cpp \
-    $$PWD/ucabstractbutton.cpp \
-    $$PWD/ucthemingextension.cpp \
-    $$PWD/ucheader.cpp \
-    $$PWD/uclabel.cpp \
-    $$PWD/uclistitemlayout.cpp \
-    $$PWD/privates/threelabelsslot_p.cpp \
-    $$PWD/ucimportversionchecker_p.cpp \
-    $$PWD/ucbottomedgehint.cpp \
-    $$PWD/ucmathutils.cpp \
-    $$PWD/ucbottomedge.cpp \
-    $$PWD/ucbottomedgestyle.cpp \
-    $$PWD/ucbottomedgeregion.cpp \
-    $$PWD/ucpagetreenode.cpp \
-    $$PWD/ucmainviewbase.cpp \
-    $$PWD/ucperformancemonitor.cpp \
-    $$PWD/privates/listviewextensions.cpp \
-    $$PWD/privates/frame.cpp \
-    $$PWD/privates/ucpagewrapper.cpp \
-    $$PWD/privates/ucpagewrapperincubator.cpp \
-    $$PWD/privates/appheaderbase.cpp
-
-# adapters
-SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
-
-RESOURCES += \
-    $$PWD/plugin.qrc
-
-OTHER_FILES += \
-    $$PWD/shaders/shape.vert \
-    $$PWD/shaders/shape.frag \
-    $$PWD/shaders/shape_no_dfdy.frag \
-    $$PWD/shaders/shapeoverlay.vert \
-    $$PWD/shaders/shapeoverlay.frag \
-    $$PWD/shaders/shapeoverlay_no_dfdy.frag \
-    $$PWD/privates/shaders/frame.vert \
-    $$PWD/privates/shaders/frame.frag
+    $$PWD/ucnamespace.cpp

=== modified file 'src/Ubuntu/Components/plugin/ucnamespace.cpp'
--- src/Ubuntu/Components/plugin/ucnamespace.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/plugin/ucnamespace.cpp	2016-07-26 08:38:05 +0000
@@ -17,9 +17,10 @@
 
 #include "ucnamespace.h"
 
+UT_NAMESPACE_BEGIN
+
 /*!
  * \qmltype Ubuntu
- * \instantiates UCNamespace
  * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \since Ubuntu.Components 1.2
@@ -76,3 +77,5 @@
 {
     return BUILD_VERSION(major, minor);
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/Components/plugin/ucnamespace.h'
--- src/Ubuntu/Components/plugin/ucnamespace.h	2015-12-07 12:09:45 +0000
+++ src/Ubuntu/Components/plugin/ucnamespace.h	2016-07-26 08:38:05 +0000
@@ -19,12 +19,10 @@
 #define UCNAMESPACE_H
 
 #include <QtCore/QObject>
-#include "quickutils.h"
+#include <UbuntuToolkit/private/quickutils_p.h>
+#include <ubuntutoolkitglobal.h>
 
-#define BUILD_VERSION(major, minor)     ((((major) & 0x00FF) << 8) | ((minor) & 0x00FF))
-#define LATEST_UITK_VERSION             BUILD_VERSION(1, 3)
-#define MAJOR_VERSION(version)          ((version) >> 8)
-#define MINOR_VERSION(version)          ((version) & 0x00FF)
+UT_NAMESPACE_BEGIN
 
 #define UC_QML_DEPRECATION_WARNING(msg) \
     { \
@@ -85,4 +83,6 @@
     quint16 m_toolkitVersion;
 };
 
+UT_NAMESPACE_END
+
 #endif // UCNAMESPACE_H

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2016-02-16 11:39:32 +0000
+++ src/Ubuntu/Components/qmldir	2016-07-26 08:38:05 +0000
@@ -1,5 +1,6 @@
 module Ubuntu.Components
 plugin UbuntuComponents
+typeinfo plugins.qmltypes
 ActionList 0.1 1.2/ActionList.qml
 ToolbarItems 0.1 1.2/ToolbarItems.qml
 ToolbarButton 0.1 1.2/ToolbarButton.qml

=== modified file 'src/Ubuntu/Test/plugin/plugin.pri'
--- src/Ubuntu/Test/plugin/plugin.pri	2016-04-04 06:36:47 +0000
+++ src/Ubuntu/Test/plugin/plugin.pri	2016-07-26 08:38:05 +0000
@@ -1,4 +1,4 @@
-QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures UbuntuToolkit
+QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures UbuntuToolkit-private
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT *= v8-private

=== modified file 'src/Ubuntu/Test/plugin/testplugin.cpp'
--- src/Ubuntu/Test/plugin/testplugin.cpp	2016-04-04 10:16:08 +0000
+++ src/Ubuntu/Test/plugin/testplugin.cpp	2016-07-26 08:38:05 +0000
@@ -17,7 +17,9 @@
 #include "testplugin.h"
 #include <QtQml>
 #include "uctestextras.h"
-#include <MouseTouchAdaptor>
+#include <UbuntuToolkit/private/mousetouchadaptor_p.h>
+
+UT_USE_NAMESPACE
 
 static QObject *registerExtras(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -30,5 +32,5 @@
 void TestPlugin::registerTypes(const char *uri)
 {
     qmlRegisterSingletonType<UCTestExtras>(uri, 1, 0, "TestExtras", registerExtras);
-    qmlRegisterSingletonType<UbuntuToolkit::MouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", UbuntuToolkit::MouseTouchAdaptor::registerQmlSingleton);
+    qmlRegisterSingletonType<MouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", MouseTouchAdaptor::registerQmlSingleton);
 }

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.cpp'
--- src/Ubuntu/Test/plugin/uctestextras.cpp	2016-04-04 10:16:08 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.cpp	2016-07-26 08:38:05 +0000
@@ -23,7 +23,9 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <private/qobject_p.h>
 #include <QSysInfo>
-#include <MouseTouchAdaptor>
+#include <UbuntuToolkit/private/mousetouchadaptor_p.h>
+
+UT_USE_NAMESPACE
 
 const char *DEVICE_MISSING_MSG = "No touch device registered. Register one using registerTouchDevice() before using %1";
 
@@ -118,7 +120,7 @@
  */
 void UCTestExtras::registerTouchDevice()
 {
-    if (UbuntuToolkit::MouseTouchAdaptor::registerTouchDevice() && m_testExtras) {
+    if (MouseTouchAdaptor::registerTouchDevice() && m_testExtras) {
         Q_EMIT m_testExtras->touchDevicePresentChanged();
     }
 }
@@ -132,7 +134,7 @@
 void UCTestExtras::touchPress(int touchId, QQuickItem *item, const QPoint &point)
 {
     CHECK_TOUCH_DEVICE(touchId, item);
-    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).press(touchId, item->mapToScene(point).toPoint(), item->window());
+    QTest::touchEvent(item->window(), MouseTouchAdaptor::touchDevice()).press(touchId, item->mapToScene(point).toPoint(), item->window());
 }
 /*!
  * \qmlmethod TestExtras::touchRelease(touchId, item, point)
@@ -142,7 +144,7 @@
 void UCTestExtras::touchRelease(int touchId, QQuickItem *item, const QPoint &point)
 {
     CHECK_TOUCH_DEVICE(touchId, item);
-    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).release(touchId, item->mapToScene(point).toPoint(), item->window());
+    QTest::touchEvent(item->window(), MouseTouchAdaptor::touchDevice()).release(touchId, item->mapToScene(point).toPoint(), item->window());
 }
 /*!
  * \qmlmethod TestExtras::touchClick(touchId, item, point)
@@ -191,7 +193,7 @@
 void UCTestExtras::touchMove(int touchId, QQuickItem *item, const QPoint &point)
 {
     CHECK_TOUCH_DEVICE(touchId, item);
-    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).move(touchId, item->mapToScene(point).toPoint(), item->window());
+    QTest::touchEvent(item->window(), MouseTouchAdaptor::touchDevice()).move(touchId, item->mapToScene(point).toPoint(), item->window());
 }
 /*!
  * \qmlmethod TestExtras::touchDrag(touchId, item, from, delta, steps = 5)
@@ -367,13 +369,14 @@
 
 void UCTestExtras::removeTimeConstraintsFromSwipeArea(QQuickItem *item)
 {
-    UCSwipeArea *swipeArea = dynamic_cast<UCSwipeArea*>(item);
+    UG_PREPEND_NAMESPACE(UCSwipeArea) *swipeArea = dynamic_cast<UG_PREPEND_NAMESPACE(UCSwipeArea)*>(item);
     if (!swipeArea) {
         qWarning() << item << "is not a SwipeArea";
         return;
     }
 
-    UCSwipeAreaPrivate *priv = static_cast<UCSwipeAreaPrivate *>(QObjectPrivate::get(swipeArea));
+    UG_PREPEND_NAMESPACE(UCSwipeAreaPrivate) *priv =
+            static_cast<UG_PREPEND_NAMESPACE(UCSwipeAreaPrivate)*>(QObjectPrivate::get(swipeArea));
     priv->setMaxTime(60 * 60 * 1000);
     priv->setCompositionTime(0);
 }

=== modified file 'src/Ubuntu/UbuntuGestures/UbuntuGestures.pro'
--- src/Ubuntu/UbuntuGestures/UbuntuGestures.pro	2016-01-20 16:10:54 +0000
+++ src/Ubuntu/UbuntuGestures/UbuntuGestures.pro	2016-07-26 08:38:05 +0000
@@ -12,18 +12,19 @@
 load(qt_build_config)
 load(ubuntu_qt_module)
 
-HEADERS += candidateinactivitytimer.h \
-           debughelpers.h \
-           timer.h \
-           timesource.h \
-           touchownershipevent.h \
-           touchregistry.h \
-           unownedtouchevent.h \
+HEADERS += candidateinactivitytimer_p.h \
+           debughelpers_p.h \
+           timer_p.h \
+           timesource_p.h \
+           touchownershipevent_p.h \
+           touchregistry_p.h \
+           unownedtouchevent_p.h \
            ubuntugesturesglobal.h \
-           pool.h \
+           pool_p.h \
            ucswipearea_p.h \
            ucswipearea_p_p.h \
            damper_p.h \
+           ubuntugesturesmodule.h
 
 
 SOURCES += candidateinactivitytimer.cpp \
@@ -34,5 +35,6 @@
            touchregistry.cpp \
            unownedtouchevent.cpp \
            ucswipearea.cpp \
-           damper.cpp
+           damper.cpp \
+           ubuntugesturesmodule.cpp
 

=== modified file 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp'
--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp	2016-07-26 08:38:05 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "candidateinactivitytimer.h"
+#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
 
-namespace UbuntuGestures {
+UG_NAMESPACE_BEGIN
 
 CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
         AbstractTimer *timer, QObject *parent)
@@ -43,4 +43,4 @@
     Q_EMIT candidateDefaulted(m_touchId, m_candidate);
 }
 
-} // namespace UbuntuGestures
+UG_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h' => 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer_p.h'
--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h	2015-11-09 08:38:28 +0000
+++ src/Ubuntu/UbuntuGestures/candidateinactivitytimer_p.h	2016-07-26 08:38:05 +0000
@@ -21,9 +21,9 @@
 
 class QQuickItem;
 
-#include "timer.h"
+#include <UbuntuGestures/private/timer_p.h>
 
-namespace UbuntuGestures {
+UG_NAMESPACE_BEGIN
 
 class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
     Q_OBJECT
@@ -46,6 +46,6 @@
     QQuickItem *m_candidate;
 };
 
-} // namespace UbuntuGestures
+UG_NAMESPACE_END
 
 #endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

=== modified file 'src/Ubuntu/UbuntuGestures/debughelpers.cpp'
--- src/Ubuntu/UbuntuGestures/debughelpers.cpp	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/debughelpers.cpp	2016-07-26 08:38:05 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "debughelpers.h"
+#include <UbuntuGestures/private/debughelpers_p.h>
 #include <QTouchEvent>
 #include <QMouseEvent>
 

=== renamed file 'src/Ubuntu/UbuntuGestures/debughelpers.h' => 'src/Ubuntu/UbuntuGestures/debughelpers_p.h'
=== renamed file 'src/Ubuntu/UbuntuGestures/pool.h' => 'src/Ubuntu/UbuntuGestures/pool_p.h'
=== modified file 'src/Ubuntu/UbuntuGestures/timer.cpp'
--- src/Ubuntu/UbuntuGestures/timer.cpp	2016-06-02 08:22:41 +0000
+++ src/Ubuntu/UbuntuGestures/timer.cpp	2016-07-26 08:38:05 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "timer.h"
+#include <UbuntuGestures/private/timer_p.h>
 
-namespace UbuntuGestures {
+UG_NAMESPACE_BEGIN
 
 Timer::Timer(QObject *parent) : AbstractTimer(parent)
 {
@@ -59,7 +59,7 @@
 /////////////////////////////////// FakeTimer //////////////////////////////////
 
 FakeTimer::FakeTimer(const SharedTimeSource &timeSource, QObject *parent)
-    : UbuntuGestures::AbstractTimer(parent)
+    : UG_PREPEND_NAMESPACE(AbstractTimer(parent))
     , m_interval(0)
     , m_singleShot(false)
     , m_timeSource(timeSource)
@@ -150,4 +150,4 @@
     return fakeTimer;
 }
 
-} // namespace UbuntuGestures
+UG_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuGestures/timer.h' => 'src/Ubuntu/UbuntuGestures/timer_p.h'
--- src/Ubuntu/UbuntuGestures/timer.h	2015-11-17 12:02:40 +0000
+++ src/Ubuntu/UbuntuGestures/timer_p.h	2016-07-26 08:38:05 +0000
@@ -18,13 +18,13 @@
 #define UBUNTUGESTURES_TIMER_H
 
 #include "ubuntugesturesglobal.h"
-#include "timesource.h"
+#include <UbuntuGestures/private/timesource_p.h>
 
 #include <QObject>
 #include <QPointer>
 #include <QTimer>
 
-namespace UbuntuGestures {
+UG_NAMESPACE_BEGIN
 
 /* Defines an interface for a Timer. */
 class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject
@@ -112,6 +112,6 @@
     QSharedPointer<FakeTimeSource> m_timeSource;
 };
 
-} // namespace UbuntuGestures
+UG_NAMESPACE_END
 
 #endif // UBUNTUGESTURES_TIMER_H

=== modified file 'src/Ubuntu/UbuntuGestures/timesource.cpp'
--- src/Ubuntu/UbuntuGestures/timesource.cpp	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/timesource.cpp	2016-07-26 08:38:05 +0000
@@ -16,21 +16,19 @@
  * Authored by: Daniel d'Andrada <[e-mail]>
  */
 
-#include "timesource.h"
+#include <UbuntuGestures/private/timesource_p.h>
 
 #include <QElapsedTimer>
 
-namespace UbuntuGestures {
+UG_NAMESPACE_BEGIN
+
 class RealTimeSourcePrivate {
 public:
     QElapsedTimer timer;
 };
-}
-
-using namespace UbuntuGestures;
 
 RealTimeSource::RealTimeSource()
-    : UbuntuGestures::TimeSource()
+    : UG_PREPEND_NAMESPACE(TimeSource())
     , d(new RealTimeSourcePrivate)
 {
     d->timer.start();
@@ -45,3 +43,5 @@
 {
     return d->timer.elapsed();
 }
+
+UG_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuGestures/timesource.h' => 'src/Ubuntu/UbuntuGestures/timesource_p.h'
--- src/Ubuntu/UbuntuGestures/timesource.h	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/timesource_p.h	2016-07-26 08:38:05 +0000
@@ -22,7 +22,7 @@
 #include "ubuntugesturesglobal.h"
 #include <QSharedPointer>
 
-namespace UbuntuGestures {
+UG_NAMESPACE_BEGIN
 /*
     Interface for a time source.
  */
@@ -57,6 +57,6 @@
     qint64 m_msecsSinceReference;
 };
 
-} // namespace UbuntuGestures
+UG_NAMESPACE_END
 
 #endif // UBUNTUGESTURES_TIMESOURCE_H

=== modified file 'src/Ubuntu/UbuntuGestures/touchownershipevent.cpp'
--- src/Ubuntu/UbuntuGestures/touchownershipevent.cpp	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/touchownershipevent.cpp	2016-07-26 08:38:05 +0000
@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "touchownershipevent.h"
+#include <UbuntuGestures/private/touchownershipevent_p.h>
+
+UG_NAMESPACE_BEGIN
 
 QEvent::Type TouchOwnershipEvent::m_touchOwnershipType = (QEvent::Type)-1;
 
@@ -33,3 +35,5 @@
 
     return m_touchOwnershipType;
 }
+
+UG_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuGestures/touchownershipevent.h' => 'src/Ubuntu/UbuntuGestures/touchownershipevent_p.h'
--- src/Ubuntu/UbuntuGestures/touchownershipevent.h	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/touchownershipevent_p.h	2016-07-26 08:38:05 +0000
@@ -20,6 +20,7 @@
 #include <QEvent>
 #include "ubuntugesturesglobal.h"
 
+UG_NAMESPACE_BEGIN
 /*
    When an item get an ownership event for a touch it can grab/steal that touch
    with a clean conscience.
@@ -47,4 +48,6 @@
     bool m_gained;
 };
 
+UG_NAMESPACE_END
+
 #endif // UBUNTU_TOUCHOWNERSHIPEVENT_H

=== modified file 'src/Ubuntu/UbuntuGestures/touchregistry.cpp'
--- src/Ubuntu/UbuntuGestures/touchregistry.cpp	2016-03-24 11:23:57 +0000
+++ src/Ubuntu/UbuntuGestures/touchregistry.cpp	2016-07-26 08:38:05 +0000
@@ -14,24 +14,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "touchregistry.h"
+#include <UbuntuGestures/private/touchregistry_p.h>
 
 #include <QCoreApplication>
 #include <QDebug>
 
 #include <private/qquickitem_p.h>
 
-#include "candidateinactivitytimer.h"
-#include "timer.h"
-#include "touchownershipevent.h"
-#include "unownedtouchevent.h"
+#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
+#include <UbuntuGestures/private/timer_p.h>
+#include <UbuntuGestures/private/touchownershipevent_p.h>
+#include <UbuntuGestures/private/unownedtouchevent_p.h>
 
 Q_LOGGING_CATEGORY(ugTouchRegistry, "libubuntugestures.TouchRegistry", QtMsgType::QtWarningMsg)
 
-#include "debughelpers.h"
+#include <UbuntuGestures/private/debughelpers_p.h>
 #define UG_DEBUG qCDebug(ugTouchRegistry) << "[TouchRegistry]"
 
-using namespace UbuntuGestures;
+UG_NAMESPACE_BEGIN
 
 TouchRegistry *TouchRegistry::m_instance = nullptr;
 
@@ -524,3 +524,5 @@
         QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);
     }
 }
+
+UG_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuGestures/touchregistry.h' => 'src/Ubuntu/UbuntuGestures/touchregistry_p.h'
--- src/Ubuntu/UbuntuGestures/touchregistry.h	2016-06-02 08:22:41 +0000
+++ src/Ubuntu/UbuntuGestures/touchregistry_p.h	2016-07-26 08:38:05 +0000
@@ -24,16 +24,14 @@
 #include <QVector>
 
 #include "ubuntugesturesglobal.h"
-#include "candidateinactivitytimer.h"
-#include "timer.h"
-#include "pool.h"
+#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
+#include <UbuntuGestures/private/timer_p.h>
+#include <UbuntuGestures/private/pool_p.h>
 
 // logging
 #include <QtCore/QLoggingCategory>
 
-namespace UbuntuGestures {
-    class AbstractTimerFactory;
-}
+UG_FORWARD_DECLARE_CLASS(AbstractTimerFactory)
 
 /*
   Where the ownership of touches is registered.
@@ -93,6 +91,9 @@
 
   [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)
  */
+
+UG_NAMESPACE_BEGIN
+
 class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject
 {
     Q_OBJECT
@@ -128,7 +129,7 @@
     void addTouchWatcher(int touchId, QQuickItem *watcherItem);
 
     // Useful for tests, where you should use fake timers
-    void setTimerFactory(UbuntuGestures::AbstractTimerFactory *timerFactory);
+    void setTimerFactory(AbstractTimerFactory *timerFactory);
 
 private Q_SLOTS:
     void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);
@@ -153,7 +154,7 @@
             InterimOwner = 2
         } state;
         QPointer<QQuickItem> item;
-        QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
+        QPointer<UG_PREPEND_NAMESPACE(CandidateInactivityTimer)> inactivityTimer;
     };
 
     class TouchInfo {
@@ -195,12 +196,14 @@
 
     bool m_inDispatchLoop;
 
-    UbuntuGestures::AbstractTimerFactory *m_timerFactory;
+    AbstractTimerFactory *m_timerFactory;
 
     friend class tst_TouchRegistry;
     friend class tst_DirectionalDragArea;
 };
 
+UG_NAMESPACE_END
+
 Q_DECLARE_LOGGING_CATEGORY(ugTouchRegistry)
 
 #endif // UNITY_TOUCHREGISTRY_H

=== modified file 'src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h'
--- src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h	2016-07-26 08:38:05 +0000
@@ -21,3 +21,27 @@
 #else
 #  define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
 #endif
+
+#if !defined(UBUNTUGESTURES_NO_NAMESPACE)
+
+#define UG_NAMESPACE_BEGIN          namespace UbuntuGestures {
+#define UG_NAMESPACE_END            }
+#define UG_PREPEND_NAMESPACE(name)  UbuntuGestures::name
+#define UG_USE_NAMESPACE            using namespace UbuntuGestures;
+#define UG_FORWARD_DECLARE_CLASS(name) \
+    UG_NAMESPACE_BEGIN class name; UG_NAMESPACE_END \
+    using UG_PREPEND_NAMESPACE(name);
+#define UG_FORWARD_DECLARE_STRUCT(name) \
+    UG_NAMESPACE_BEGIN struct name; UG_NAMESPACE_END \
+    using UG_PREPEND_NAMESPACE(name);
+
+#else // no namespace
+
+#define UG_NAMESPACE_BEGIN
+#define UG_NAMESPACE_END
+#define UG_PREPEND_NAMESPACE(name)  name
+#define UG_USE_NAMESPACE
+#define UG_FORWARD_DECLARE_CLASS(name) class name;
+#define UG_FORWARD_DECLARE_STRUCT(name) struct name;
+
+#endif

=== added file 'src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp'
--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp	2016-07-26 08:38:05 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include <QtQml/QQmlEngine>
+#include <QtQml>
+#include "ubuntugesturesmodule.h"
+#include <private/ucswipearea_p.h>
+
+UG_NAMESPACE_BEGIN
+
+void UbuntuGesturesModule::defineModule(const char *uri)
+{
+    qmlRegisterType<UCSwipeArea>(uri, 1, 3, "SwipeArea");
+}
+
+void UbuntuGesturesModule::undefineModule()
+{
+    // nothing so far
+}
+
+UG_NAMESPACE_END

=== added file 'src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h'
--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h	2016-07-26 08:38:05 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UBUNTUGESTURESMODULE_H
+#define UBUNTUGESTURESMODULE_H
+
+#include <ubuntugesturesglobal.h>
+
+UG_NAMESPACE_BEGIN
+
+class UBUNTUGESTURES_EXPORT UbuntuGesturesModule
+{
+public:
+    static void defineModule(const char *uri);
+    static void undefineModule();
+};
+
+UG_NAMESPACE_END
+
+#endif // UBUNTUGESTURESMODULE_H

=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp'
--- src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-07-26 08:38:05 +0000
@@ -25,11 +25,11 @@
 #include <private/qquickwindow_p.h>
 
 // local
-#include <UbuntuGestures/TouchOwnershipEvent>
-#include <UbuntuGestures/TouchRegistry>
-#include <UbuntuGestures/UnownedTouchEvent>
+#include <UbuntuGestures/private/touchownershipevent_p.h>
+#include <UbuntuGestures/private/touchregistry_p.h>
+#include <UbuntuGestures/private/unownedtouchevent_p.h>
 
-using namespace UbuntuGestures;
+UG_NAMESPACE_BEGIN
 
 Q_LOGGING_CATEGORY(ucSwipeArea, "ubuntu.components.SwipeArea", QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(ucActiveTouchInfo, "ubuntu.components.SwipeArea.ActiveTouchInfo", QtMsgType::QtWarningMsg)
@@ -253,7 +253,7 @@
     }
 }
 
-void UCSwipeAreaPrivate::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
+void UCSwipeAreaPrivate::setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer)
 {
     int interval = 0;
     bool timerWasRunning = false;
@@ -273,7 +273,7 @@
     recognitionTimer = timer;
     timer->setInterval(interval);
     timer->setSingleShot(wasSingleShot);
-    QObject::connect(timer, &UbuntuGestures::AbstractTimer::timeout,
+    QObject::connect(timer, &UG_PREPEND_NAMESPACE(AbstractTimer)::timeout,
             q, &UCSwipeArea::rejectGesture);
     if (timerWasRunning) {
         recognitionTimer->start();
@@ -1055,3 +1055,5 @@
 {
     statusChangeListeners.removeAll(listener);
 }
+
+UG_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p.h'
--- src/Ubuntu/UbuntuGestures/ucswipearea_p.h	2016-03-07 15:56:06 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea_p.h	2016-07-26 08:38:05 +0000
@@ -22,17 +22,17 @@
 #include "ubuntugesturesglobal.h"
 
 // lib UbuntuGestures
-#include <UbuntuGestures/Pool>
-#include <UbuntuGestures/Timer>
+#include <UbuntuGestures/private/pool_p.h>
+#include <UbuntuGestures/private/timer_p.h>
 
 // logging
 #include <QtCore/QLoggingCategory>
 
+UG_NAMESPACE_BEGIN
+
 class TouchOwnershipEvent;
 class UnownedTouchEvent;
 class UCSwipeAreaPrivate;
-
-class UCSwipeAreaPrivate;
 class UBUNTUGESTURES_EXPORT UCSwipeArea : public QQuickItem
 {
     Q_OBJECT
@@ -101,6 +101,8 @@
     Q_DECLARE_PRIVATE(UCSwipeArea)
 };
 
+UG_NAMESPACE_END
+
 Q_DECLARE_LOGGING_CATEGORY(ucSwipeArea)
 Q_DECLARE_LOGGING_CATEGORY(ucActiveTouchInfo)
 

=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h'
--- src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h	2016-01-08 17:03:07 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h	2016-07-26 08:38:05 +0000
@@ -23,6 +23,8 @@
 
 #include "damper_p.h"
 
+UG_NAMESPACE_BEGIN
+
 // Information about an active touch point
 struct UBUNTUGESTURES_EXPORT ActiveTouchInfo {
     ActiveTouchInfo() : id(-1), startTime(-1) {}
@@ -33,12 +35,12 @@
 };
 class UBUNTUGESTURES_EXPORT ActiveTouchesInfo {
 public:
-    ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);
+    ActiveTouchesInfo(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource);
     void update(QTouchEvent *event);
     qint64 touchStartTime(int id);
     bool isEmpty() const { return m_touchInfoPool.isEmpty(); }
     qint64 mostRecentStartTime();
-    UbuntuGestures::SharedTimeSource m_timeSource;
+    UG_PREPEND_NAMESPACE(SharedTimeSource) m_timeSource;
 private:
     void addTouchPoint(int touchId);
     void removeTouchPoint(int touchId);
@@ -68,10 +70,10 @@
     // Replaces the existing Timer with the given one.
     //
     // Useful for providing a fake timer when testing.
-    void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
+    void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer);
 
     // Useful for testing, where a fake time source can be supplied
-    void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
+    void setTimeSource(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource);
 
     // Describes the state of the directional drag gesture.
     enum Status {
@@ -133,13 +135,13 @@
     QPointF previousDampedScenePos;
     // Unit vector in scene coordinates describing the direction of the gesture recognition
     QPointF sceneDirectionVector;
-    UbuntuGestures::SharedTimeSource timeSource;
+    UG_PREPEND_NAMESPACE(SharedTimeSource) timeSource;
     ActiveTouchesInfo activeTouches;
 
     // status change listeners
     QList<UCSwipeAreaStatusListener*> statusChangeListeners;
 
-    UbuntuGestures::AbstractTimer *recognitionTimer;
+    UG_PREPEND_NAMESPACE(AbstractTimer) *recognitionTimer;
 
     // How far a touch point has to move from its initial position along the gesture axis in order
     // for it to be recognized as a directional drag.
@@ -171,4 +173,6 @@
     virtual void swipeStatusChanged(UCSwipeAreaPrivate::Status /*old*/, UCSwipeAreaPrivate::Status /*new*/) {}
 };
 
+UG_NAMESPACE_END
+
 #endif // UCSWIPEAREAPRIVATE_H

=== modified file 'src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp'
--- src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp	2016-07-26 08:38:05 +0000
@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "unownedtouchevent.h"
+#include <UbuntuGestures/private/unownedtouchevent_p.h>
+
+UG_NAMESPACE_BEGIN
 
 QEvent::Type UnownedTouchEvent::m_unownedTouchEventType = (QEvent::Type)-1;
 
@@ -37,3 +39,5 @@
 {
     return m_touchEvent.data();
 }
+
+UG_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuGestures/unownedtouchevent.h' => 'src/Ubuntu/UbuntuGestures/unownedtouchevent_p.h'
--- src/Ubuntu/UbuntuGestures/unownedtouchevent.h	2015-11-09 08:31:43 +0000
+++ src/Ubuntu/UbuntuGestures/unownedtouchevent_p.h	2016-07-26 08:38:05 +0000
@@ -21,6 +21,7 @@
 #include <QScopedPointer>
 #include "ubuntugesturesglobal.h"
 
+UG_NAMESPACE_BEGIN
 /*
  A touch event with touch points that do not belong the item receiving it.
 
@@ -42,4 +43,6 @@
     QScopedPointer<QTouchEvent> m_touchEvent;
 };
 
+UG_NAMESPACE_END
+
 #endif // UBUNTU_UNOWNEDTOUCHEVENT_H

=== modified file 'src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro'
--- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-06-02 12:50:02 +0000
+++ src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-07-26 08:38:05 +0000
@@ -3,6 +3,15 @@
 
 QT *= core-private gui-private qml qml-private quick quick-private testlib
 
+unix {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += gio-2.0 dbus-1 libnih libnih-dbus
+}
+QT *= dbus svg UbuntuGestures UbuntuGestures_private
+
+# QOrganizer for Alarm API
+QT *= organizer
+
 !contains(QT_ARCH, arm) {
     DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
     LIBS += -lX11 -lxcb -lXi
@@ -15,23 +24,221 @@
 INCLUDEPATH+=$$PWD
 
 DEFINES += UBUNTUTOOLKIT_LIBRARY
+#comment in the following line to disable traces
+#DEFINES += QT_NO_DEBUG_OUTPUT
+DEFINES += QT_USE_QSTRINGBUILDER
 
 load(qt_build_config)
 load(ubuntu_qt_module)
 
-HEADERS += \ 
-    colorutils.h \
+QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
+DEFINES -= QT_DEPRECATED_WARNINGS
+DEFINES -= QT_ASCII_CAST_WARNINGS
+
+HEADERS += \
+    colorutils_p.h \
     ubuntutoolkitglobal.h \
-    tree.h \
-    asyncloader.h \
+    tree_p.h \
     asyncloader_p.h \
-    mousetouchadaptor.h \
+    asyncloader_p_p.h \
     mousetouchadaptor_p.h \
-    propertychange.h
+    mousetouchadaptor_p_p.h \
+    propertychange_p.h \
+    ubuntutoolkitmodule.h
 
 SOURCES += \ 
     colorutils.cpp \
     tree.cpp \
     asyncloader.cpp \
     mousetouchadaptor.cpp \
-    propertychange.cpp
+    propertychange.cpp \
+    ubuntutoolkitmodule.cpp
+
+HEADERS += \
+    uctheme_p.h \
+    i18n_p.h \
+    listener_p.h \
+    ucscalingimageprovider_p.h \
+    ucunits_p.h \
+    ucqquickimageextension_p.h \
+    quickutils_p.h \
+    ucubuntushapetextures_p.h \
+    ucubuntushape_p.h \
+    ucubuntushapeoverlay_p.h \
+    ucproportionalshape_p.h \
+    inversemouseareatype_p.h \
+    qquickclipboard_p.h \
+    qquickmimedata_p.h \
+    qquickclipboard_p_p.h \
+    ucubuntuanimation_p.h \
+    ucfontutils_p.h \
+    ucapplication_p.h \
+    ucarguments_p.h \
+    ucargument_p.h \
+    ucalarm_p.h \
+    ucalarm_p_p.h \
+    alarmmanager_p_p.h \
+    alarmmanager_p.h \
+    ucalarmmodel_p.h \
+    unitythemeiconprovider_p.h \
+    adapters/alarmsadapter_p.h \
+    ucstatesaver_p.h \
+    sortbehavior_p.h \
+    filterbehavior_p.h \
+    sortfiltermodel_p.h \
+    statesaverbackend_p.h \
+    ucstatesaver_p_p.h \
+    ucurihandler_p.h \
+    ucinversemouse_p.h \
+    ucmouse_p.h \
+    unixsignalhandler_p.h \
+    ucstyleditembase_p.h \
+    ucstyleditembase_p_p.h \
+    ucaction_p.h \
+    ucactioncontext_p.h \
+    ucactionmanager_p.h \
+    adapters/actionsproxy_p.h \
+    adapters/dbuspropertywatcher_p.h \
+    uclistitem_p.h \
+    uclistitem_p_p.h \
+    uclistitemactions_p.h \
+    uclistitemactions_p_p.h \
+    uclistitemstyle_p.h \
+    ucserviceproperties_p.h \
+    ucserviceproperties_p_p.h \
+    privates/listitemdragarea_p.h \
+    privates/listitemdraghandler_p.h \
+    privates/listitemselection_p.h \
+    ucdeprecatedtheme_p.h \
+    ucdefaulttheme_p.h \
+    ucstylehints_p.h \
+    ucslotslayout_p.h \
+    ucslotslayout_p_p.h \
+    livetimer_p.h \
+    livetimer_p_p.h \
+    timeutils_p.h \
+    ucactionitem_p.h \
+    ucactionitem_p_p.h \
+    uchaptics_p.h \
+    ucabstractbutton_p.h \
+    ucabstractbutton_p_p.h \
+    ucmargins_p.h \
+    ucthemingextension_p.h \
+    ucheader_p.h \
+    uclabel_p.h \
+    uclistitemlayout_p.h \
+    privates/threelabelsslot_p.h \
+    ucimportversionchecker_p.h \
+    ucbottomedgehint_p.h \
+    ucbottomedgehint_p_p.h \
+    ucmathutils_p.h \
+    ucbottomedge_p.h \
+    ucbottomedge_p_p.h \
+    ucbottomedgestyle_p.h \
+    ucbottomedgeregion_p.h \
+    ucpagetreenode_p.h \
+    ucpagetreenode_p_p.h \
+    ucmainviewbase_p.h \
+    ucmainviewbase_p_p.h \
+    ucperformancemonitor_p.h \
+    privates/listviewextensions_p.h \
+    privates/frame_p.h \
+    privates/ucpagewrapper_p.h \
+    privates/ucpagewrapper_p_p.h \
+    privates/ucpagewrapperincubator_p.h \
+    privates/appheaderbase_p.h \
+    label_p.h \
+    ucbottomedgeregion_p_p.h
+
+SOURCES += \
+    uctheme.cpp \
+    i18n.cpp \
+    listener.cpp \
+    ucscalingimageprovider.cpp \
+    ucunits.cpp \
+    ucqquickimageextension.cpp \
+    quickutils.cpp \
+    ucubuntushapetextures.cpp \
+    ucubuntushape.cpp \
+    ucubuntushapeoverlay.cpp \
+    ucproportionalshape.cpp \
+    inversemouseareatype.cpp \
+    qquickclipboard.cpp \
+    qquickmimedata.cpp \
+    ucubuntuanimation.cpp \
+    ucfontutils.cpp \
+    ucapplication.cpp \
+    ucarguments.cpp \
+    ucargument.cpp \
+    ucalarm.cpp \
+    alarmmanager_p.cpp \
+    ucalarmmodel.cpp \
+    unitythemeiconprovider.cpp \
+    ucstatesaver.cpp \
+    sortbehavior.cpp \
+    filterbehavior.cpp \
+    sortfiltermodel.cpp \
+    statesaverbackend_p.cpp \
+    ucurihandler.cpp \
+    ucmousefilters.cpp \
+    unixsignalhandler_p.cpp \
+    ucstyleditembase.cpp \
+    ucaction.cpp \
+    ucactioncontext.cpp \
+    ucactionmanager.cpp \
+    adapters/actionsproxy_p.cpp \
+    adapters/dbuspropertywatcher_p.cpp \
+    uclistitem.cpp \
+    uclistitemactions.cpp \
+    uclistitemstyle.cpp \
+    ucviewitemsattached.cpp \
+    ucserviceproperties.cpp \
+    privates/listitemdragarea.cpp \
+    privates/listitemdraghandler.cpp \
+    privates/listitemexpansion.cpp \
+    privates/listitemselection.cpp \
+    ucdeprecatedtheme.cpp \
+    ucdefaulttheme.cpp \
+    ucstylehints.cpp \
+    ucslotslayout.cpp \
+    livetimer.cpp \
+    livetimer_p.cpp \
+    ucactionitem.cpp \
+    uchaptics.cpp \
+    ucabstractbutton.cpp \
+    ucthemingextension.cpp \
+    ucheader.cpp \
+    uclabel.cpp \
+    uclistitemlayout.cpp \
+    privates/threelabelsslot_p.cpp \
+    ucimportversionchecker_p.cpp \
+    ucbottomedgehint.cpp \
+    ucmathutils.cpp \
+    ucbottomedge.cpp \
+    ucbottomedgestyle.cpp \
+    ucbottomedgeregion.cpp \
+    ucpagetreenode.cpp \
+    ucmainviewbase.cpp \
+    ucperformancemonitor.cpp \
+    privates/listviewextensions.cpp \
+    privates/frame.cpp \
+    privates/ucpagewrapper.cpp \
+    privates/ucpagewrapperincubator.cpp \
+    privates/appheaderbase.cpp
+
+# adapters
+SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
+
+#resources
+RESOURCES += \
+    $$PWD/resources.qrc
+
+OTHER_FILES += \
+    $$PWD/shaders/shape.vert \
+    $$PWD/shaders/shape.frag \
+    $$PWD/shaders/shape_no_dfdy.frag \
+    $$PWD/shaders/shapeoverlay.vert \
+    $$PWD/shaders/shapeoverlay.frag \
+    $$PWD/shaders/shapeoverlay_no_dfdy.frag \
+    $$PWD/privates/shaders/frame.vert \
+    $$PWD/privates/shaders/frame.frag

=== renamed directory 'src/Ubuntu/Components/plugin/adapters' => 'src/Ubuntu/UbuntuToolkit/adapters'
=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp'
--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp	2015-12-22 14:42:59 +0000
+++ src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-07-26 08:38:05 +0000
@@ -15,7 +15,7 @@
  */
 
 #include "actionsproxy_p.h"
-#include "ucactioncontext.h"
+#include "ucactioncontext_p.h"
 
 #include <QDebug>
 
@@ -23,6 +23,8 @@
 
 #define AP_TRACE(params) qCDebug(ucActionProxy) << params
 
+UT_NAMESPACE_BEGIN
+
 ActionProxy::ActionProxy()
     : globalContext(new UCActionContext)
 {
@@ -155,3 +157,5 @@
 {
     Q_UNUSED(context);
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h'
--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h	2015-12-22 14:42:59 +0000
+++ src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h	2016-07-26 08:38:05 +0000
@@ -20,7 +20,9 @@
 #include <QtCore/QObject>
 #include <QtCore/QSet>
 #include <QtCore/QPointer>
-#include "ucaction.h"
+#include "ucaction_p.h"
+
+UT_NAMESPACE_BEGIN
 
 class UCActionContext;
 class UCPopupContext;
@@ -58,4 +60,6 @@
     void removePopupContext(UCPopupContext *context);
 };
 
+UT_NAMESPACE_END
+
 #endif // ACTIONSPROXY_P_H

=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp'
--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2015-03-24 16:51:39 +0000
+++ src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-07-26 08:38:05 +0000
@@ -16,9 +16,9 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include "ucalarm.h"
 #include "ucalarm_p.h"
-#include "alarmmanager_p.h"
+#include "ucalarm_p_p.h"
+#include "alarmmanager_p_p.h"
 #include "alarmsadapter_p.h"
 #include <qorganizertodooccurrence.h>
 
@@ -48,6 +48,8 @@
 
 QTORGANIZER_USE_NAMESPACE
 
+UT_NAMESPACE_BEGIN
+
 /*-----------------------------------------------------------------------------
  * Adaptation layer for Alarm Data.
  */
@@ -821,3 +823,5 @@
         }
     }
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h'
--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2016-05-13 08:39:18 +0000
+++ src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h	2016-07-26 08:38:05 +0000
@@ -19,19 +19,23 @@
 #ifndef ALARMSADAPTER_P_H
 #define ALARMSADAPTER_P_H
 
-#include "alarmmanager_p_p.h"
+#include "private/ucalarm_p_p.h"
+#include "private/alarmmanager_p_p.h"
 
 #include <qorganizer.h>
 #include <qorganizermanager.h>
 #include <qorganizertodo.h>
+#include <ubuntutoolkitglobal.h>
 
 QTORGANIZER_USE_NAMESPACE
 
+UT_NAMESPACE_BEGIN
+
 /*-----------------------------------------------------------------------------
  * Adaptation layer for Alarms.
  */
 
-class AlarmDataAdapter : public UCAlarmPrivate
+class UBUNTUTOOLKIT_EXPORT AlarmDataAdapter : public UCAlarmPrivate
 {
 public:
     AlarmDataAdapter(UCAlarm *qq);
@@ -206,4 +210,6 @@
     QOrganizerTodo todoItem(const QOrganizerItemId &id);
 };
 
+UT_NAMESPACE_END
+
 #endif // ALARMSADAPTER_P_H

=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp'
--- src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp	2016-01-30 12:03:31 +0000
+++ src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-07-26 08:38:05 +0000
@@ -18,11 +18,13 @@
 #include <QtDBus/QDBusReply>
 #include <unistd.h>
 #include <sys/types.h>
-#include "i18n.h"
+#include "i18n_p.h"
 #include <QtQml/QQmlInfo>
 
 #define DYNAMIC_PROPERTY    "__q_property"
 
+UT_NAMESPACE_BEGIN
+
 UCServicePropertiesPrivate *createServicePropertiesAdapter(UCServiceProperties *owner)
 {
     return new DBusServiceProperties(owner);
@@ -224,3 +226,5 @@
         readProperty(property);
     }
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h'
--- src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h	2016-07-26 08:38:05 +0000
@@ -22,9 +22,12 @@
 #include <QtDBus/QDBusServiceWatcher>
 #include <QtDBus/QDBusInterface>
 
-#include "ucserviceproperties_p.h"
+#include "ucserviceproperties_p_p.h"
 
 class QDBusPendingCallWatcher;
+
+UT_NAMESPACE_BEGIN
+
 class DBusServiceProperties : public QObject, public UCServicePropertiesPrivate
 {
     Q_OBJECT
@@ -52,4 +55,6 @@
     void updateProperties(const QString &iface, const QVariantMap &map, const QStringList &invalidated);
 };
 
+UT_NAMESPACE_END
+
 #endif // DBUSPROPERTYWATCHER_P_H

=== renamed file 'src/Ubuntu/Components/plugin/alarmmanager_p.cpp' => 'src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp'
--- src/Ubuntu/Components/plugin/alarmmanager_p.cpp	2015-02-26 15:09:23 +0000
+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp	2016-07-26 08:38:05 +0000
@@ -16,10 +16,10 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include "alarmmanager_p.h"
 #include "alarmmanager_p_p.h"
-#include "ucalarm.h"
-#include "ucalarm_p.h"
+#include "ucalarm_p_p.h"
+
+UT_NAMESPACE_BEGIN
 
 AlarmManagerPrivate::AlarmManagerPrivate(AlarmManager *qq)
     : q_ptr(qq)
@@ -88,4 +88,4 @@
     return AlarmManagerPrivate::get()->createAlarmData(alarm);
 }
 
-#include "moc_alarmmanager_p.cpp"
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/alarmmanager_p.h' => 'src/Ubuntu/UbuntuToolkit/alarmmanager_p.h'
--- src/Ubuntu/Components/plugin/alarmmanager_p.h	2015-02-26 10:27:56 +0000
+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p.h	2016-07-26 08:38:05 +0000
@@ -23,7 +23,9 @@
 #include <QtQml/QQmlListProperty>
 #include <QtCore/QSet>
 
-#include "ucalarm.h"
+#include "ucalarm_p.h"
+
+UT_NAMESPACE_BEGIN
 
 class AlarmUtils {
 public:
@@ -72,7 +74,7 @@
 class AlarmManagerPrivate;
 class AlarmRequestPrivate;
 class AlarmList;
-class AlarmManager : public QObject
+class UBUNTUTOOLKIT_EXPORT AlarmManager : public QObject
 {
     Q_OBJECT
 public:
@@ -122,4 +124,6 @@
     QScopedPointer<AlarmManagerPrivate> d_ptr;
 };
 
+UT_NAMESPACE_END
+
 #endif // ALARMMANAGER_H

=== renamed file 'src/Ubuntu/Components/plugin/alarmmanager_p_p.h' => 'src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h'
--- src/Ubuntu/Components/plugin/alarmmanager_p_p.h	2015-02-26 15:09:23 +0000
+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h	2016-07-26 08:38:05 +0000
@@ -19,12 +19,13 @@
 #ifndef ALARMMANAGER_P_H
 #define ALARMMANAGER_P_H
 
-#include "ucalarm.h"
 #include "ucalarm_p.h"
 #include "alarmmanager_p.h"
 #include <QtCore/QUrl>
 
-class AlarmManagerPrivate
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate
 {
     Q_DECLARE_PUBLIC(AlarmManager)
 public:
@@ -58,4 +59,6 @@
 
 AlarmManagerPrivate * createAlarmsAdapter(AlarmManager *alarms);
 
+UT_NAMESPACE_END
+
 #endif // ALARMMANAGER_P_H

=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.cpp'
--- src/Ubuntu/UbuntuToolkit/asyncloader.cpp	2016-03-16 17:20:49 +0000
+++ src/Ubuntu/UbuntuToolkit/asyncloader.cpp	2016-07-26 08:38:05 +0000
@@ -16,13 +16,13 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include "asyncloader_p.h"
+#include "asyncloader_p_p.h"
 
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 #include <QtQuick/QQuickItem>
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 AsyncLoader::AsyncLoader(QObject *parent)
     : QObject(*(new AsyncLoaderPrivate), parent)
@@ -218,4 +218,4 @@
     d_func()->forceCompletion();
 }
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuToolkit/asyncloader.h' => 'src/Ubuntu/UbuntuToolkit/asyncloader_p.h'
--- src/Ubuntu/UbuntuToolkit/asyncloader.h	2016-04-01 05:30:24 +0000
+++ src/Ubuntu/UbuntuToolkit/asyncloader_p.h	2016-07-26 08:38:05 +0000
@@ -25,7 +25,7 @@
 class QQuickItem;
 class QQmlContext;
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 class AsyncLoaderPrivate;
 class UBUNTUTOOLKIT_EXPORT AsyncLoader : public QObject
@@ -58,6 +58,6 @@
     Q_DECLARE_PRIVATE(AsyncLoader)
 };
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END
 
 #endif // ASYNCLOADER_H

=== renamed file 'src/Ubuntu/UbuntuToolkit/asyncloader_p.h' => 'src/Ubuntu/UbuntuToolkit/asyncloader_p_p.h'
--- src/Ubuntu/UbuntuToolkit/asyncloader_p.h	2016-02-25 14:30:46 +0000
+++ src/Ubuntu/UbuntuToolkit/asyncloader_p_p.h	2016-07-26 08:38:05 +0000
@@ -21,9 +21,11 @@
 
 #include <QtCore/private/qobject_p.h>
 #include <QtQml/QQmlIncubator>
-#include <AsyncLoader>
+#include <ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/asyncloader_p.h>
+#include <UbuntuToolkit/private/asyncloader_p_p.h>
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 class AsyncLoaderPrivate : public QObjectPrivate, public QQmlIncubator
 {
@@ -48,7 +50,6 @@
     void detachComponent();
 };
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END
 
 #endif // ASYNCLOADER_P_H
-

=== modified file 'src/Ubuntu/UbuntuToolkit/colorutils.cpp'
--- src/Ubuntu/UbuntuToolkit/colorutils.cpp	2016-01-22 09:31:54 +0000
+++ src/Ubuntu/UbuntuToolkit/colorutils.cpp	2016-07-26 08:38:05 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "colorutils.h"
+#include "colorutils_p.h"
 #include <QColor>
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 ColorUtils::ColorUtils(QObject *parent) : QObject(parent)
 {}
@@ -27,4 +27,4 @@
     return color.lightnessF();
 }
 
-}
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuToolkit/colorutils.h' => 'src/Ubuntu/UbuntuToolkit/colorutils_p.h'
--- src/Ubuntu/UbuntuToolkit/colorutils.h	2016-01-26 09:57:35 +0000
+++ src/Ubuntu/UbuntuToolkit/colorutils_p.h	2016-07-26 08:38:05 +0000
@@ -19,7 +19,7 @@
 #include <QObject>
 #include "ubuntutoolkitglobal.h"
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 class UBUNTUTOOLKIT_EXPORT ColorUtils : public QObject
 {
@@ -29,6 +29,6 @@
     Q_INVOKABLE static qreal luminance(const QColor &color);
 };
 
-}
+UT_NAMESPACE_END
 
 #endif // COLORUTILS_H

=== renamed file 'src/Ubuntu/Components/plugin/filterbehavior.cpp' => 'src/Ubuntu/UbuntuToolkit/filterbehavior.cpp'
--- src/Ubuntu/Components/plugin/filterbehavior.cpp	2014-06-04 16:59:07 +0000
+++ src/Ubuntu/UbuntuToolkit/filterbehavior.cpp	2016-07-26 08:38:05 +0000
@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filterbehavior.h"
+#include "filterbehavior_p.h"
+
+UT_NAMESPACE_BEGIN
 
 FilterBehavior::FilterBehavior(QObject *parent)
     : QObject(parent)
@@ -53,3 +55,4 @@
     Q_EMIT patternChanged();
 }
 
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/filterbehavior.h' => 'src/Ubuntu/UbuntuToolkit/filterbehavior_p.h'
--- src/Ubuntu/Components/plugin/filterbehavior.h	2014-06-04 16:59:07 +0000
+++ src/Ubuntu/UbuntuToolkit/filterbehavior_p.h	2016-07-26 08:38:05 +0000
@@ -21,8 +21,11 @@
 #define FILTERBEHAVIOR_H
 
 #include <QSortFilterProxyModel>
-
-class FilterBehavior : public QObject {
+#include <ubuntutoolkitglobal.h>
+
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT FilterBehavior : public QObject {
     Q_OBJECT
 
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
@@ -45,4 +48,6 @@
     QRegExp m_pattern;
 };
 
+UT_NAMESPACE_END
+
 #endif // FILTERBEHAVIOR_H

=== renamed file 'src/Ubuntu/Components/plugin/i18n.cpp' => 'src/Ubuntu/UbuntuToolkit/i18n.cpp'
--- src/Ubuntu/Components/plugin/i18n.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuToolkit/i18n.cpp	2016-07-26 08:38:05 +0000
@@ -16,7 +16,7 @@
  * Author: Tim Peeters <[e-mail]>
  */
 
-#include "i18n.h"
+#include "i18n_p.h"
 #include "timeutils_p.h"
 #include <QtCore/QDir>
 
@@ -29,9 +29,9 @@
 #include <stdlib.h>
 #include <locale.h>
 
+UT_NAMESPACE_BEGIN
 /*!
  * \qmltype i18n
- * \instantiates UbuntuI18n
  * \inqmlmodule Ubuntu.Components
  * \ingroup ubuntu
  * \brief i18n is a context property that provides internationalization support.
@@ -167,8 +167,10 @@
 /*!
  * \qmlmethod string i18n::tr(string singular, string plural, int n)
  * Translate the given input string \a singular or \a plural (depending on the number of items \a n)
- * using gettext. Should be called like this:
- *          tr("%n file", "%n files", count)
+ * using gettext.
+ * Note that tr() does not automatically insert the values in the QString,
+ * so it should be called like this:
+ *          tr("%1 file", "%1 files", count).arg(count)
  */
 QString UbuntuI18n::tr(const QString &singular, const QString &plural, int n)
 {
@@ -191,7 +193,7 @@
 /*!
  * \qmlmethod string i18n::dtr(string domain, string singular, string plural, int n)
  * Translate the given text using gettext. Should be called like this:
- *          tr(domain, "%n file", "%n files", count)
+ *          tr(domain, "%1 file", "%1 files", count).arg(count)
  * Uses \a domain for the domain instead of i18n.domain, and \a singular or \a plural
  * as input for the translation depending on the number of items \a n.
  */
@@ -339,3 +341,5 @@
     }
     return datetime.toString(Qt::DefaultLocaleShortDate);
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/i18n.h' => 'src/Ubuntu/UbuntuToolkit/i18n_p.h'
--- src/Ubuntu/Components/plugin/i18n.h	2016-02-10 09:54:59 +0000
+++ src/Ubuntu/UbuntuToolkit/i18n_p.h	2016-07-26 08:38:05 +0000
@@ -20,11 +20,14 @@
 #define UBUNTU_COMPONENTS_I18N_H
 
 #include <QtCore/QObject>
+#include <ubuntutoolkitglobal.h>
 
 class QQmlContext;
 class QQmlEngine;
 
-class UbuntuI18n : public QObject
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT UbuntuI18n : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
@@ -75,4 +78,6 @@
     QString m_language;
 };
 
+UT_NAMESPACE_END
+
 #endif // UBUNTU_COMPONENTS_I18N_H

=== renamed file 'src/Ubuntu/Components/plugin/inversemouseareatype.cpp' => 'src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp'
--- src/Ubuntu/Components/plugin/inversemouseareatype.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp	2016-07-26 08:38:05 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inversemouseareatype.h"
+#include "inversemouseareatype_p.h"
 #include <QtGui/QGuiApplication>
-#include "quickutils.h"
+#include "quickutils_p.h"
+
+UT_NAMESPACE_BEGIN
 
 /*!
   \qmltype InverseMouseArea
-  \instantiates InverseMouseAreaType
   \inqmlmodule Ubuntu.Components
   \ingroup ubuntu
   \brief The InverseMouseArea captures mouse events happening outside of a given
@@ -568,3 +569,5 @@
     bool pointOutArea = (m_sensingArea && m_sensingArea->contains(m_sensingArea->mapFromScene(scenePos)));
     return !pointInArea && !pointInOSK && pointOutArea;
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/inversemouseareatype.h' => 'src/Ubuntu/UbuntuToolkit/inversemouseareatype_p.h'
--- src/Ubuntu/Components/plugin/inversemouseareatype.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/inversemouseareatype_p.h	2016-07-26 08:38:05 +0000
@@ -18,9 +18,13 @@
 
 #include <private/qquickmousearea_p.h>
 #include <QtCore/QPointer>
+#include <ubuntutoolkitglobal.h>
 
 class QQuickItem;
-class InverseMouseAreaType : public QQuickMouseArea
+
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT InverseMouseAreaType : public QQuickMouseArea
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *sensingArea READ sensingArea WRITE setSensingArea NOTIFY sensingAreaChanged)
@@ -67,4 +71,6 @@
     void updateEventFilter(bool enable);
 };
 
+UT_NAMESPACE_END
+
 #endif // INVERSEMOUSEAREATYPE_H

=== renamed file 'src/Ubuntu/Components/plugin/label_p.h' => 'src/Ubuntu/UbuntuToolkit/label_p.h'
--- src/Ubuntu/Components/plugin/label_p.h	2016-04-25 15:15:52 +0000
+++ src/Ubuntu/UbuntuToolkit/label_p.h	2016-07-26 08:38:05 +0000
@@ -17,7 +17,9 @@
 #ifndef LABEL_P
 #define LABEL_P
 
-#include "uclabel.h"
+#include "uclabel_p.h"
+
+UT_NAMESPACE_BEGIN
 
 class UCLabelPrivate
 {
@@ -55,5 +57,6 @@
     static QColor getDefaultColor(QQuickItem *item, UCTheme *theme);
 };
 
+UT_NAMESPACE_END
+
 #endif // LABEL_P
-

=== renamed file 'src/Ubuntu/Components/plugin/listener.cpp' => 'src/Ubuntu/UbuntuToolkit/listener.cpp'
--- src/Ubuntu/Components/plugin/listener.cpp	2015-02-12 07:31:08 +0000
+++ src/Ubuntu/UbuntuToolkit/listener.cpp	2016-07-26 08:38:05 +0000
@@ -14,10 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listener.h"
+#include "listener_p.h"
 
 #include <QQmlContext>
 
+UT_NAMESPACE_BEGIN
+
 ContextPropertyChangeListener::ContextPropertyChangeListener(QQmlContext *context, const QString &contextProperty) :
     QObject(context),
     m_context(context),
@@ -30,3 +32,5 @@
     QVariant value = m_context->contextProperty(m_contextProperty);
     m_context->setContextProperty(m_contextProperty, value);
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/listener.h' => 'src/Ubuntu/UbuntuToolkit/listener_p.h'
--- src/Ubuntu/Components/plugin/listener.h	2015-02-12 07:31:08 +0000
+++ src/Ubuntu/UbuntuToolkit/listener_p.h	2016-07-26 08:38:05 +0000
@@ -17,11 +17,14 @@
 #ifndef UBUNTU_COMPONENTS_LISTENER_H
 #define UBUNTU_COMPONENTS_LISTENER_H
 
-#include <QObject>
+#include <QtCore/QObject>
+#include <ubuntutoolkitglobal.h>
 
 class QQmlContext;
 
-class ContextPropertyChangeListener : public QObject
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT ContextPropertyChangeListener : public QObject
 {
     Q_OBJECT
 public:
@@ -31,4 +34,6 @@
     QString m_contextProperty;
 };
 
+UT_NAMESPACE_END
+
 #endif // UBUNTU_COMPONENTS_PLUGIN_H

=== renamed file 'src/Ubuntu/Components/plugin/livetimer.cpp' => 'src/Ubuntu/UbuntuToolkit/livetimer.cpp'
--- src/Ubuntu/Components/plugin/livetimer.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuToolkit/livetimer.cpp	2016-07-26 08:38:05 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "livetimer.h"
-#include "livetimer_p.h"
+#include "livetimer_p_p.h"
+
+UT_NAMESPACE_BEGIN
 
 /*! \qmltype LiveTimer
-    \instantiates LiveTimer
     \inqmlmodule Ubuntu.Components
     \ingroup ubuntu
     \since Ubuntu.Components 1.3
@@ -140,3 +140,5 @@
 {
     m_effectiveFrequency = frequency;
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/livetimer_p.cpp' => 'src/Ubuntu/UbuntuToolkit/livetimer_p.cpp'
--- src/Ubuntu/Components/plugin/livetimer_p.cpp	2015-07-20 15:34:32 +0000
+++ src/Ubuntu/UbuntuToolkit/livetimer_p.cpp	2016-07-26 08:38:05 +0000
@@ -14,11 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "livetimer_p.h"
+#include "livetimer_p_p.h"
 #include "timeutils_p.h"
 
 #include <QDBusConnection>
 
+UT_NAMESPACE_BEGIN
+
 SharedLiveTimer::SharedLiveTimer(QObject* parent)
     : QObject(parent)
     , m_frequency(LiveTimer::Disabled)
@@ -167,3 +169,5 @@
     }
     reInitTimer();
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/livetimer.h' => 'src/Ubuntu/UbuntuToolkit/livetimer_p.h'
--- src/Ubuntu/Components/plugin/livetimer.h	2015-08-12 09:56:12 +0000
+++ src/Ubuntu/UbuntuToolkit/livetimer_p.h	2016-07-26 08:38:05 +0000
@@ -19,8 +19,11 @@
 
 #include <QObject>
 #include <QDateTime>
-
-class LiveTimer : public QObject
+#include <ubuntutoolkitglobal.h>
+
+UT_NAMESPACE_BEGIN
+
+class UBUNTUTOOLKIT_EXPORT LiveTimer : public QObject
 {
     Q_OBJECT
     Q_ENUMS(Frequency)
@@ -65,4 +68,6 @@
     friend class SharedLiveTimer;
 };
 
+UT_NAMESPACE_END
+
 #endif // LIVETIMER_H

=== renamed file 'src/Ubuntu/Components/plugin/livetimer_p.h' => 'src/Ubuntu/UbuntuToolkit/livetimer_p_p.h'
--- src/Ubuntu/Components/plugin/livetimer_p.h	2015-07-20 15:34:32 +0000
+++ src/Ubuntu/UbuntuToolkit/livetimer_p_p.h	2016-07-26 08:38:05 +0000
@@ -17,10 +17,12 @@
 #ifndef LIVETIMER_P_H
 #define LIVETIMER_P_H
 
-#include "livetimer.h"
+#include "livetimer_p.h"
 
 #include <QTimer>
 
+UT_NAMESPACE_BEGIN
+
 class SharedLiveTimer : public QObject
 {
     Q_OBJECT
@@ -55,4 +57,6 @@
     QDateTime m_lastUpdate;
 };
 
+UT_NAMESPACE_END
+
 #endif // LIVETIMER_P_H

=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp	2016-04-07 14:03:00 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp	2016-07-26 08:38:05 +0000
@@ -17,7 +17,7 @@
  *              Zsombor Egri <[e-mail]>
  */
 
-#include "mousetouchadaptor_p.h"
+#include "mousetouchadaptor_p_p.h"
 
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qwindowsysteminterface.h>
@@ -30,7 +30,7 @@
     #define ENABLE_TOUCH_EMULATION
 #endif
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 QTouchDevice *MouseTouchAdaptor::m_touchDevice = nullptr;
 
@@ -133,6 +133,6 @@
     qWarning() << "MouseTouchAdaptor not available on this architecture, thus cannot be enabled.";
 }
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END
 
-#include "moc_mousetouchadaptor.cpp"
+#include "moc_mousetouchadaptor_p.cpp"

=== renamed file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h' => 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h	2016-04-04 10:16:08 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-07-26 08:38:05 +0000
@@ -29,7 +29,7 @@
 class QQmlEngine;
 class QJSEngine;
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 // Transforms QMouseEvents into single-finger QTouchEvents.
 class MouseTouchAdaptorPrivate;
@@ -58,6 +58,6 @@
     static QTouchDevice *m_touchDevice;
 };
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END
 
 #endif // MOUSE_TOUCH_ADAPTOR_H

=== renamed file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h' => 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p_p.h'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-05-13 08:39:18 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p_p.h	2016-07-26 08:38:05 +0000
@@ -19,13 +19,13 @@
 #ifndef MOUSETOUCHADAPTOR_P
 #define MOUSETOUCHADAPTOR_P
 
-#include "mousetouchadaptor.h"
+#include "mousetouchadaptor_p.h"
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/QAbstractNativeEventFilter>
 #include <QWindow>
 #include <xcb/xcb.h>
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 class MouseTouchAdaptorPrivate : public QObjectPrivate, public QAbstractNativeEventFilter
 {
@@ -71,7 +71,7 @@
 };
 #endif
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END
 
 #endif // MOUSETOUCHADAPTOR_P
 

=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-04-07 14:03:00 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-07-26 08:38:05 +0000
@@ -53,7 +53,7 @@
 **
 ****************************************************************************/
 
-#include "mousetouchadaptor_p.h"
+#include "mousetouchadaptor_p_p.h"
 
 #include <qpa/qplatformnativeinterface.h>
 
@@ -96,7 +96,7 @@
 } // end of anonymous namespace
 
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 X11MouseTouchAdaptorPrivate::X11MouseTouchAdaptorPrivate()
     : m_leftButtonIsPressed(false)
@@ -279,10 +279,10 @@
 
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
                                                        false /* autoCommit */);
-    touchEvent.press(0 /* touchId */, windowPos);
+    touchEvent.press(0 /* touchId */, windowPos, (QWindow*)nullptr);
     if (qtMod == TRI_PRESS_MODIFIER) {
-        touchEvent.press(1, windowPos);
-        touchEvent.press(2, windowPos);
+        touchEvent.press(1, windowPos, (QWindow*)nullptr);
+        touchEvent.press(2, windowPos, (QWindow*)nullptr);
         m_triPressModifier = true;
     }
     touchEvent.commit(false /* processEvents */);
@@ -305,10 +305,10 @@
 
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
                                                        false /* autoCommit */);
-    touchEvent.release(0 /* touchId */, windowPos);
+    touchEvent.release(0 /* touchId */, windowPos, (QWindow*)nullptr);
     if (m_triPressModifier) {
-        touchEvent.release(1, windowPos);
-        touchEvent.release(2, windowPos);
+        touchEvent.release(1, windowPos, (QWindow*)nullptr);
+        touchEvent.release(2, windowPos, (QWindow*)nullptr);
     }
     touchEvent.commit(false /* processEvents */);
 
@@ -330,15 +330,15 @@
 
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
                                                        false /* autoCommit */);
-    touchEvent.move(0 /* touchId */, windowPos);
+    touchEvent.move(0 /* touchId */, windowPos, (QWindow*)nullptr);
     if (m_triPressModifier) {
         if (qtMod == TRI_PRESS_MODIFIER) {
-            touchEvent.move(1, windowPos);
-            touchEvent.move(2, windowPos);
+            touchEvent.move(1, windowPos, (QWindow*)nullptr);
+            touchEvent.move(2, windowPos, (QWindow*)nullptr);
         } else {
             // released modifiers
-            touchEvent.release(1, windowPos);
-            touchEvent.release(2, windowPos);
+            touchEvent.release(1, windowPos, (QWindow*)nullptr);
+            touchEvent.release(2, windowPos, (QWindow*)nullptr);
             m_triPressModifier = false;
         }
     }
@@ -347,4 +347,4 @@
     return true;
 }
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END

=== renamed directory 'src/Ubuntu/Components/plugin/privates' => 'src/Ubuntu/UbuntuToolkit/privates'
=== modified file 'src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp'
--- src/Ubuntu/Components/plugin/privates/appheaderbase.cpp	2016-02-02 14:46:58 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp	2016-07-26 08:38:05 +0000
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "appheaderbase.h"
-#include "ucstyleditembase_p.h"
+#include "appheaderbase_p.h"
+#include "ucstyleditembase_p_p.h"
+
+UT_NAMESPACE_BEGIN
 
 /*!
     \qmltype AppHeaderBase
@@ -67,3 +69,5 @@
         Q_EMIT animateChanged();
     }
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/privates/appheaderbase.h' => 'src/Ubuntu/UbuntuToolkit/privates/appheaderbase_p.h'
--- src/Ubuntu/Components/plugin/privates/appheaderbase.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/appheaderbase_p.h	2016-07-26 08:38:05 +0000
@@ -17,20 +17,29 @@
 #ifndef APPHEADERBASE_H
 #define APPHEADERBASE_H
 
-#include "ucheader.h"
+#include "ucheader_p.h"
+
+UT_NAMESPACE_BEGIN
+
 class UCTheme;
-
-class UCAppHeaderBase : public UCHeader
+class UBUNTUTOOLKIT_EXPORT UCAppHeaderBase : public UCHeader
 {
     Q_OBJECT
     Q_PROPERTY(bool animate MEMBER m_animate WRITE setAnimate NOTIFY animateChanged FINAL)
 
     // FIXME Re-expose properties that would be inaccessible due to a QML bug
     // https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1389721
+#ifdef Q_QDOC
     Q_PROPERTY(UCTheme *theme
             READ theme2
             WRITE setTheme2
             NOTIFY themeChanged2 FINAL)
+#else
+    Q_PROPERTY(UT_PREPEND_NAMESPACE(UCTheme) *theme
+            READ theme2
+            WRITE setTheme2
+            NOTIFY themeChanged2 FINAL)
+#endif
 
 public:
     explicit UCAppHeaderBase(QQuickItem *parent = 0);
@@ -51,4 +60,6 @@
     bool m_animate:1;
 };
 
+UT_NAMESPACE_END
+
 #endif // APPHEADERBASE_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/frame.cpp'
--- src/Ubuntu/Components/plugin/privates/frame.cpp	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/frame.cpp	2016-07-26 08:38:05 +0000
@@ -16,11 +16,13 @@
  * Author: Loïc Molinari <[e-mail]>
  */
 
-#include "frame.h"
-#include "textures.h"
+#include "frame_p.h"
+#include "textures_p.h"
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFunctions>
 
+UT_NAMESPACE_BEGIN
+
 const QRgb defaultColor = qRgba(255, 255, 255, 255);
 const float defaultThickness = 20.0f;
 const float defaultRadius = 50.0f;
@@ -467,3 +469,5 @@
 
     return node;
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/privates/frame.h' => 'src/Ubuntu/UbuntuToolkit/privates/frame_p.h'
--- src/Ubuntu/Components/plugin/privates/frame.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/frame_p.h	2016-07-26 08:38:05 +0000
@@ -22,6 +22,9 @@
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QSGMaterial>
 #include <QtQuick/QSGNode>
+#include <ubuntutoolkitglobal.h>
+
+UT_NAMESPACE_BEGIN
 
 class UCFrameMaterial : public QSGMaterial
 {
@@ -54,7 +57,7 @@
 };
 
 // Renders the frame (border) of a shape.
-class UCFrame : public QQuickItem
+class UBUNTUTOOLKIT_EXPORT UCFrame : public QQuickItem
 {
     Q_OBJECT
 
@@ -96,6 +99,6 @@
     Q_DISABLE_COPY(UCFrame)
 };
 
-QML_DECLARE_TYPE(UCFrame)
+UT_NAMESPACE_END
 
 #endif  // FRAME_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp	2016-07-26 08:38:05 +0000
@@ -14,12 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listitemdragarea.h"
-#include "listitemdraghandler.h"
-#include "uclistitem.h"
-#include "uclistitem_p.h"
-#include "ucunits.h"
-#include "i18n.h"
+#include "listitemdragarea_p.h"
+#include "listitemdraghandler_p.h"
+#include "uclistitem_p_p.h"
+#include "ucunits_p.h"
+#include "i18n_p.h"
 #include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
@@ -31,6 +30,8 @@
 #define MAX(x, y)           ((x) > (y) ? (x) : (y))
 #define CLAMP(v, min, max)  ((min) <= (max) ? MAX(min, MIN(v, max)) : MAX(max, MIN(v, min)))
 
+UT_NAMESPACE_BEGIN
+
 ListItemDragArea::ListItemDragArea(QQuickItem *parent)
     : QQuickItem(parent)
     , listView(static_cast<QQuickFlickable*>(parent))
@@ -310,3 +311,5 @@
         UCListItemPrivate::get(item)->dragHandler->update(targetItem);
     }
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/privates/listitemdragarea.h' => 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea_p.h'
--- src/Ubuntu/Components/plugin/privates/listitemdragarea.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea_p.h	2016-07-26 08:38:05 +0000
@@ -17,11 +17,15 @@
 #ifndef LISTITEMDRAGAREA_H
 #define LISTITEMDRAGAREA_H
 
-#include "uclistitem.h"
+#include <ubuntutoolkitglobal.h>
+#include "uclistitem_p.h"
 #include <QtCore/QBasicTimer>
 #include <QtCore/QPointer>
 
 class QQuickFlickable;
+
+UT_NAMESPACE_BEGIN
+
 class ListItemDragArea : public QQuickItem
 {
     Q_OBJECT
@@ -52,4 +56,6 @@
     void updateDraggedItem();
 };
 
+UT_NAMESPACE_END
+
 #endif // LISTITEMDRAGAREA_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemdraghandler.cpp	2016-06-02 12:50:02 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-07-26 08:38:05 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listitemdraghandler.h"
-#include "uclistitem.h"
+#include "listitemdraghandler_p.h"
 #include "uclistitem_p.h"
+#include "uclistitem_p_p.h"
+#include <propertychange_p.h>
 #include <QtQuick/private/qquickanimation_p.h>
 
-using namespace UbuntuToolkit;
+UT_NAMESPACE_BEGIN
 
 ListItemDragHandler::ListItemDragHandler(UCListItem *baseItem, UCListItem *listItem)
     : QObject(listItem)
@@ -28,7 +29,7 @@
     , baseVisible(nullptr)
 {
     targetPos = baseItem->position();
-    baseVisible = new UbuntuToolkit::PropertyChange(baseItem, "visible");
+    baseVisible = new PropertyChange(baseItem, "visible");
 }
 
 ListItemDragHandler::~ListItemDragHandler()
@@ -39,7 +40,7 @@
 
 void ListItemDragHandler::init()
 {
-    UbuntuToolkit::PropertyChange::setValue(baseVisible, false);
+    PropertyChange::setValue(baseVisible, false);
     // position the item and show it
     listItem->setPosition(baseItem->position());
     listItem->setZ(2);
@@ -85,3 +86,5 @@
         targetPos = hoveredItem->position();
     }
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/privates/listitemdraghandler.h' => 'src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler_p.h'
--- src/Ubuntu/Components/plugin/privates/listitemdraghandler.h	2016-06-02 12:50:02 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler_p.h	2016-07-26 08:38:05 +0000
@@ -20,11 +20,12 @@
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 #include <QtCore/QPointF>
-#include <PropertyChange>
+#include <ubuntutoolkitglobal.h>
 
-using namespace UbuntuToolkit;
+UT_NAMESPACE_BEGIN
 
 class UCListItem;
+class PropertyChange;
 class ListItemDragHandler : public QObject
 {
     Q_OBJECT
@@ -46,4 +47,6 @@
     QPointF targetPos;
 };
 
+UT_NAMESPACE_END
+
 #endif // LISTITEMDRAGHANDLER_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemexpansion.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp	2015-09-23 14:31:26 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemexpansion.cpp	2016-07-26 08:38:05 +0000
@@ -14,8 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "uclistitem.h"
-#include "uclistitem_p.h"
+#include "uclistitem_p_p.h"
+
+UT_NAMESPACE_BEGIN
 
 UCListItemExpansion::UCListItemExpansion(QObject *parent)
     : QObject(parent)
@@ -104,3 +105,5 @@
     m_height = height;
     Q_EMIT heightChanged();
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemselection.cpp	2015-11-16 16:24:42 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp	2016-07-26 08:38:05 +0000
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listitemselection.h"
-#include "uclistitem_p.h"
+#include "listitemselection_p.h"
+#include "uclistitem_p_p.h"
+
+UT_NAMESPACE_BEGIN
 
 ListItemSelection::ListItemSelection(UCListItem *parent)
     : QObject(parent)
@@ -139,3 +141,5 @@
         Q_EMIT hostItem->selectedChanged();
     }
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/privates/listitemselection.h' => 'src/Ubuntu/UbuntuToolkit/privates/listitemselection_p.h'
--- src/Ubuntu/Components/plugin/privates/listitemselection.h	2015-11-16 16:24:42 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemselection_p.h	2016-07-26 08:38:05 +0000
@@ -19,6 +19,9 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
+#include <ubuntutoolkitglobal.h>
+
+UT_NAMESPACE_BEGIN
 
 class UCViewItemsAttached;
 class UCListItem;
@@ -53,4 +56,6 @@
     void syncWithViewItems();
 };
 
+UT_NAMESPACE_END
+
 #endif // LISTITEMSELECTION_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp'
--- src/Ubuntu/Components/plugin/privates/listviewextensions.cpp	2016-04-21 15:16:02 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp	2016-07-26 08:38:05 +0000
@@ -16,12 +16,14 @@
  * Author Zsombor Egri <[e-mail]>
  */
 
-#include "listviewextensions.h"
-#include "uclistitem_p.h"
-#include "quickutils.h"
+#include "listviewextensions_p.h"
+#include "uclistitem_p_p.h"
+#include "quickutils_p.h"
 #include <QtQuick/QQuickItem>
 #include <QtQuick/private/qquickflickable_p.h>
 
+UT_NAMESPACE_BEGIN
+
 ListViewProxy::ListViewProxy(QQuickFlickable *listView, QObject *parent)
     : QObject(parent)
     , listView(listView)
@@ -151,3 +153,5 @@
 
     return (oldIndex != currentIndex);
 }
+
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/privates/listviewextensions.h' => 'src/Ubuntu/UbuntuToolkit/privates/listviewextensions_p.h'
--- src/Ubuntu/Components/plugin/privates/listviewextensions.h	2016-01-15 06:33:03 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listviewextensions_p.h	2016-07-26 08:38:05 +0000
@@ -20,11 +20,15 @@
 #define LISTVIEWEXTENSIONS_H
 
 #include <QtCore/QObject>
+#include <ubuntutoolkitglobal.h>
 
 class QQuickFlickable;
 class QQuickItem;
 class QFocusEvent;
 class QKeyEvent;
+
+UT_NAMESPACE_BEGIN
+
 class ListViewProxy : public QObject
 {
     Q_OBJECT
@@ -57,4 +61,6 @@
     bool isEventFilter:1;
 };
 
+UT_NAMESPACE_END
+
 #endif // LISTVIEWEXTENSIONS_H

=== renamed file 'src/Ubuntu/Components/plugin/privates/textures.h' => 'src/Ubuntu/UbuntuToolkit/privates/textures_p.h'
=== modified file 'src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-07-26 08:38:05 +0000
@@ -16,9 +16,11 @@
 
 #include "threelabelsslot_p.h"
 #include "label_p.h"
-#include "ucunits.h"
-#include "ucfontutils.h"
-#include "uctheme.h"
+#include "ucunits_p.h"
+#include "ucfontutils_p.h"
+#include "uctheme_p.h"
+
+UT_NAMESPACE_BEGIN
 
 UCThreeLabelsSlotPrivate::UCThreeLabelsSlotPrivate()
     : QQuickItemPrivate()
@@ -238,3 +240,5 @@
     }
     return d->m_summary;
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h	2016-01-27 16:02:15 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h	2016-07-26 08:38:05 +0000
@@ -19,20 +19,29 @@
 
 #include <QQuickItem>
 #include <private/qquickitem_p.h>
+#include <ubuntutoolkitglobal.h>
 
 //The padding between title and the string below it (i.e. subtitle, or
 //summary, when subtitle is empty)
 #define TITLE_SPACING_DP                       2
 
+UT_NAMESPACE_BEGIN
+
 class UCTheme;
 class UCLabel;
 class UCThreeLabelsSlotPrivate;
 class UCThreeLabelsSlot : public QQuickItem
 {
     Q_OBJECT
+#ifdef Q_QDOC
     Q_PROPERTY(UCLabel *title READ title CONSTANT FINAL)
     Q_PROPERTY(UCLabel *subtitle READ subtitle CONSTANT FINAL)
     Q_PROPERTY(UCLabel *summary READ summary CONSTANT FINAL)
+#else
+    Q_PROPERTY(UT_PREPEND_NAMESPACE(UCLabel) *title READ title CONSTANT FINAL)
+    Q_PROPERTY(UT_PREPEND_NAMESPACE(UCLabel) *subtitle READ subtitle CONSTANT FINAL)
+    Q_PROPERTY(UT_PREPEND_NAMESPACE(UCLabel) *summary READ summary CONSTANT FINAL)
+#endif
 
 public:
     explicit UCThreeLabelsSlot(QQuickItem *parent = 0);
@@ -78,5 +87,6 @@
     UCLabel *m_summary;
 };
 
+UT_NAMESPACE_END
 
 #endif // THREELABELSSLOT_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-07-26 08:38:05 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ucpagewrapper.h"
-#include "ucpagewrapper_p.h"
+#include "ucpagewrapper_p_p.h"
 #include "ucpagewrapperincubator_p.h"
 
 #include <QQmlEngine>
 #include <QQmlContext>
 
+UT_NAMESPACE_BEGIN
+
 UCPageWrapperPrivate::UCPageWrapperPrivate() :
     m_object(nullptr),
     m_parentPage(nullptr),
@@ -770,4 +771,6 @@
   Signal emitted when incubator completes page loading.
  */
 
-#include "moc_ucpagewrapper.cpp"
+UT_NAMESPACE_END
+
+#include "moc_ucpagewrapper_p.cpp"

=== renamed file 'src/Ubuntu/Components/plugin/privates/ucpagewrapper.h' => 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h	2016-07-26 08:38:05 +0000
@@ -17,10 +17,13 @@
 #ifndef UCPAGEWRAPPER_H
 #define UCPAGEWRAPPER_H
 
-#include "ucpagetreenode.h"
+#include <ubuntutoolkitglobal.h>
+#include "ucpagetreenode_p.h"
+
+UT_NAMESPACE_BEGIN
 
 class UCPageWrapperPrivate;
-class UCPageWrapper : public UCPageTreeNode
+class UBUNTUTOOLKIT_EXPORT UCPageWrapper : public UCPageTreeNode
 {
     Q_OBJECT
     Q_PROPERTY(QVariant reference READ reference WRITE setReference NOTIFY referenceChanged)
@@ -110,4 +113,6 @@
     Q_PRIVATE_SLOT(d_func(), void onActiveChanged())
 };
 
+UT_NAMESPACE_END
+
 #endif // UCPAGEWRAPPER_H

=== renamed file 'src/Ubuntu/Components/plugin/privates/ucpagewrapper_p.h' => 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p_p.h'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapper_p.h	2016-02-18 19:18:13 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p_p.h	2016-07-26 08:38:05 +0000
@@ -17,7 +17,11 @@
 #ifndef UCPAGEWRAPPER_P_H
 #define UCPAGEWRAPPER_P_H
 
-#include "ucpagetreenode_p.h"
+#include <ubuntutoolkitglobal.h>
+#include "ucpagetreenode_p_p.h"
+#include "ucpagewrapper_p.h"
+
+UT_NAMESPACE_BEGIN
 
 class UCPageWrapper;
 class UCPageWrapperIncubator;
@@ -74,4 +78,6 @@
     bool m_ownsComponent:1;
 };
 
+UT_NAMESPACE_END
+
 #endif // UCPAGEWRAPPER_P_H

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator.cpp	2016-02-18 19:18:13 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp	2016-07-26 08:38:05 +0000
@@ -18,6 +18,8 @@
 #include <QVariantMap>
 #include <QQmlInfo>
 
+UT_NAMESPACE_BEGIN
+
 /*!
   \internal
   Incubator wrapper object. Used when page is loaded asynchronously.
@@ -59,3 +61,5 @@
     }
     Q_EMIT statusHasChanged(status);
 }
+
+UT_NAMESPACE_END

=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h'
--- src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h	2016-04-28 11:19:46 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h	2016-07-26 08:38:05 +0000
@@ -21,6 +21,9 @@
 #include <QQmlIncubator>
 #include <QJSValue>
 #include <QVariant>
+#include <ubuntutoolkitglobal.h>
+
+UT_NAMESPACE_BEGIN
 
 class UCPageWrapperIncubator : public QObject, public QQmlIncubator
 {
@@ -56,4 +59,6 @@
     QJSValue m_onStatusChanged;
 };
 
+UT_NAMESPACE_END
+
 #endif // UCPAGEWRAPPERINCUBATOR_H

=== modified file 'src/Ubuntu/UbuntuToolkit/propertychange.cpp'
--- src/Ubuntu/UbuntuToolkit/propertychange.cpp	2016-06-02 12:50:02 +0000
+++ src/Ubuntu/UbuntuToolkit/propertychange.cpp	2016-07-26 08:38:05 +0000
@@ -14,14 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "propertychange.h"
+#include "propertychange_p.h"
 
 #include <QtQml/private/qqmlabstractbinding_p.h>
 #define foreach Q_FOREACH //workaround to fix private includes
 #include <QtQml/private/qqmlbinding_p.h>     // for QmlBinding
 #undef foreach
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 /*
  * The class is used to save properties and their bindings while the property is
  * altered temporarily.
@@ -124,4 +124,4 @@
     }
 }
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/UbuntuToolkit/propertychange.h' => 'src/Ubuntu/UbuntuToolkit/propertychange_p.h'
--- src/Ubuntu/UbuntuToolkit/propertychange.h	2016-06-02 12:50:02 +0000
+++ src/Ubuntu/UbuntuToolkit/propertychange_p.h	2016-07-26 08:38:05 +0000
@@ -28,7 +28,7 @@
 
 class QQmlAbstractBinding;
 
-namespace UbuntuToolkit {
+UT_NAMESPACE_BEGIN
 
 class UBUNTUTOOLKIT_EXPORT PropertyChange
 {
@@ -59,6 +59,6 @@
     void backup();
 };
 
-} // namespace UbuntuToolkit
+UT_NAMESPACE_END
 
 #endif // PROPERTYCHANGE_P_H

=== renamed file 'src/Ubuntu/Components/plugin/qquickclipboard.cpp' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp'
--- src/Ubuntu/Components/plugin/qquickclipboard.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp	2016-07-26 08:38:05 +0000
@@ -19,9 +19,10 @@
 #include <QtGui/QClipboard>
 #include <QtGui/QGuiApplication>
 
-#include "qquickclipboard.h"
-#include "qquickclipboard_p.h"
-#include "qquickmimedata.h"
+#include "qquickclipboard_p_p.h"
+#include "qquickmimedata_p.h"
+
+UT_NAMESPACE_BEGIN
 
 /*!
  * \qmltype Clipboard
@@ -106,30 +107,37 @@
  * The signal is triggered when clipboard content gets changed.
  */
 
-QQuickClipboardPrivate::QQuickClipboardPrivate(QQuickClipboard *qq) :
-    q_ptr(qq),
+QQuickClipboardPrivate::QQuickClipboardPrivate() :
     clipboard(QGuiApplication::clipboard()),
     mode(QClipboard::Clipboard),
     mimeData(0)
 {
+}
+
+void QQuickClipboardPrivate::init()
+{
+    Q_Q(QQuickClipboard);
     // connect to the system clipboard's dataChanged signal so we get update
-    QObject::connect(clipboard, SIGNAL(dataChanged()), q_ptr, SIGNAL(dataChanged()));
+    QObject::connect(clipboard, SIGNAL(dataChanged()), q, SIGNAL(dataChanged()));
 }
 
 void QQuickClipboardPrivate::updateMimeData()
 {
     const QMimeData *data = clipboard->mimeData(mode);
-    if (!mimeData)
-        mimeData = new QQuickMimeData(clipboard->mimeData(mode), true, q_ptr);
-    else
+    if (!mimeData) {
+        Q_Q(QQuickClipboard);
+        mimeData = new QQuickMimeData(clipboard->mimeData(mode), true, q);
+    } else {
         mimeData->fromMimeData(data);
+    }
 }
 
 
 QQuickClipboard::QQuickClipboard(QObject *parent) :
-    QObject(parent),
-    d_ptr(new QQuickClipboardPrivate(this))
+    QObject(*(new QQuickClipboardPrivate), parent)
 {
+    Q_D(QQuickClipboard);
+    d->init();
 }
 
 /*!
@@ -196,4 +204,4 @@
     d->clipboard->clear(d->mode);
 }
 
-#include "moc_qquickclipboard.cpp"
+UT_NAMESPACE_END

=== renamed file 'src/Ubuntu/Components/plugin/qquickclipboard.h' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h'
--- src/Ubuntu/Components/plugin/qquickclipboard.h	2013-01-27 12:47:00 +0000
+++ src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h	2016-07-26 08:38:05 +0000
@@ -22,19 +22,27 @@
 #include <QtCore/QObject>
 #include <QtQml/QJSEngine>
 #include <QtQml/QQmlEngine>
+#include <ubuntutoolkitglobal.h>
 
-class QQuickMimeData;
 class QQmlEngine;
 class QJSEngine;
+
+UT_NAMESPACE_BEGIN
+
+class QQuickMimeData;
 class QQuickClipboardPrivate;
-class QQuickClipboard : public QObject
+class UBUNTUTOOLKIT_EXPORT QQuickClipboard : public QObject
 {
     Q_OBJECT
+#ifndef Q_QDOC
+    Q_PROPERTY(UT_PREPEND_NAMESPACE(QQuickMimeData) *data READ data NOTIFY dataChanged)
+#else
     Q_PROPERTY(QQuickMimeData *data READ data NOTIFY dataChanged)
+#endif
 public:
     explicit QQuickClipboard(QObject *parent = 0);
 
-    Q_INVOKABLE QQuickMimeData *newData();
+    Q_INVOKABLE UT_PREPEND_NAMESPACE(QQuickMimeData) *newData();
 
 private: //getter/setter
     QQuickMimeData *data();
@@ -48,7 +56,8 @@
 
 private:
     Q_DECLARE_PRIVATE(QQuickClipboard)
-    QScopedPointer<QQuickClipboardPrivate> d_ptr;
 };
 
+UT_NAMESPACE_END
+
 #endif // QQUICKCLIPBOARD_H

=== renamed file 'src/Ubuntu/Components/plugin/qquickclipboard_p.h' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard_p_p.h'
--- src/Ubuntu/Components/plugin/qquickclipboard_p.h	2013-01-25 15:45:15 +0000
+++ src/Ubuntu/UbuntuToolkit/qquickclipboard_p_p.h	2016-07-26 08:38:05 +0000
@@ -19,16 +19,19 @@
 #ifndef QQUICKCLIPBOARD_P_H
 #define QQUICKCLIPBOARD_P_H
 
-#include "qquickclipboard.h"
+#include "qquickclipboard_p.h"
 #include <QtGui/QClipboard>
+#include <QtCore/private/qobject_p.h>
+
+UT_NAMESPACE_BEGIN
 
 class QQuickMimeData;
-class QQuickClipboardPrivate {
+class QQuickClipboardPrivate : public QObjectPrivate {
     Q_DECLARE_PUBLIC(QQuickClipboard)
 public:
-    QQuickClipboardPrivate(QQuickClipboard *qq);
+    QQuickClipboardPrivate();
+    void init();
 
-    QQuickClipboard *q_ptr;
     QClipboard *clipboard;
     QClipboard::Mode mode;
     QQuickMimeData *mimeData;
@@ -36,4 +39,6 @@
     void updateMimeData();
 };
 
+UT_NAMESPACE_END
+
 #endif // QQUICKCLIPBOARD_P_H

=== renamed file 'src/Ubuntu/Components/plugin/qquickmimedata.cpp' => 'src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp'
--- src/Ubuntu/Components/plugin/qquickmimedata.cpp	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp	2016-07-26 08:38:05 +0000
@@ -21,13 +21,14 @@
 #include <QtCore/QMimeData>
 #include <QtCore/QMimeDatabase>
 #include <QtCore/QMimeType>
-#include "qquickmimedata.h"
+#include "qquickmimedata_p.h"