Ubuntu UI Toolkit

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

moveStyledItem
Merge into staging

Proposed by Zsombor Egri on 2016-06-08

Status:	Merged
Approved by:	Benjamin Zeller on 2016-06-22
Approved revision:	2018
Merged at revision:	2018
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	10275 lines (+2593/-1563) 260 files modified .qmake.conf (+5/-0) components.api (+349/-348) debian/libubuntugestures5-dev.install (+2/-10) debian/libubuntutoolkit5-dev.install (+69/-5) documentation/overview.qdoc (+12/-12) documentation/ubuntu-ui-toolkit-common.qdocconf (+8/-1) features/ubuntu_qml_plugin.prf (+1/-0) features/ubuntu_qt_module.prf (+1/-0) src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp (+0/-46) src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h (+0/-52) src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h (+0/-24) src/Ubuntu/Components/plugin/plugin.cpp (+16/-300) src/Ubuntu/Components/plugin/plugin.h (+4/-17) src/Ubuntu/Components/plugin/plugin.pri (+4/-200) src/Ubuntu/Components/plugin/ucnamespace.cpp (+4/-1) src/Ubuntu/Components/plugin/ucnamespace.h (+5/-5) src/Ubuntu/Test/plugin/testplugin.cpp (+4/-2) src/Ubuntu/Test/plugin/uctestextras.cpp (+10/-7) src/Ubuntu/UbuntuGestures/UbuntuGestures.pro (+3/-1) src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp (+2/-2) src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h (+2/-2) src/Ubuntu/UbuntuGestures/timer.cpp (+2/-2) src/Ubuntu/UbuntuGestures/timer.h (+2/-2) src/Ubuntu/UbuntuGestures/timesource.cpp (+4/-4) src/Ubuntu/UbuntuGestures/timesource.h (+2/-2) src/Ubuntu/UbuntuGestures/touchownershipevent.cpp (+4/-0) src/Ubuntu/UbuntuGestures/touchownershipevent.h (+3/-0) src/Ubuntu/UbuntuGestures/touchregistry.cpp (+3/-1) src/Ubuntu/UbuntuGestures/touchregistry.h (+9/-6) src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h (+24/-0) src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp (+36/-0) src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h (+35/-0) src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+3/-1) src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+4/-2) src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+4/-0) src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp (+4/-0) src/Ubuntu/UbuntuGestures/unownedtouchevent.h (+3/-0) src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+210/-3) src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h (+7/-2) src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h (+5/-0) src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/alarmmanager_p.h (+5/-1) src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h (+5/-1) src/Ubuntu/UbuntuToolkit/asyncloader.cpp (+2/-2) src/Ubuntu/UbuntuToolkit/asyncloader.h (+2/-2) src/Ubuntu/UbuntuToolkit/asyncloader_p.h (+4/-3) src/Ubuntu/UbuntuToolkit/colorutils.cpp (+2/-2) src/Ubuntu/UbuntuToolkit/colorutils.h (+2/-2) src/Ubuntu/UbuntuToolkit/filterbehavior.cpp (+3/-0) src/Ubuntu/UbuntuToolkit/filterbehavior.h (+7/-2) src/Ubuntu/UbuntuToolkit/i18n.cpp (+3/-1) src/Ubuntu/UbuntuToolkit/i18n.h (+6/-1) src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/inversemouseareatype.h (+7/-1) src/Ubuntu/UbuntuToolkit/label_p.h (+4/-1) src/Ubuntu/UbuntuToolkit/listener.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/listener.h (+7/-2) src/Ubuntu/UbuntuToolkit/livetimer.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/livetimer.h (+7/-2) src/Ubuntu/UbuntuToolkit/livetimer_p.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/livetimer_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp (+2/-2) src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h (+2/-2) src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h (+2/-2) src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp (+13/-13) src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/appheaderbase.h (+13/-2) src/Ubuntu/UbuntuToolkit/privates/frame.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/frame.h (+5/-2) src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.h (+5/-0) src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp (+6/-3) src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.h (+5/-2) src/Ubuntu/UbuntuToolkit/privates/listitemexpansion.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/listitemselection.h (+5/-0) src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/listviewextensions.h (+6/-0) src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h (+10/-0) src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.h (+5/-1) src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h (+5/-0) src/Ubuntu/UbuntuToolkit/propertychange.cpp (+2/-2) src/Ubuntu/UbuntuToolkit/propertychange.h (+2/-2) src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/qquickclipboard.h (+13/-3) src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/qquickmimedata.h (+5/-1) src/Ubuntu/UbuntuToolkit/quickutils.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/quickutils.h (+16/-1) src/Ubuntu/UbuntuToolkit/sortbehavior.cpp (+3/-0) src/Ubuntu/UbuntuToolkit/sortbehavior.h (+7/-2) src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/sortfiltermodel.h (+6/-2) src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp (+3/-1) src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h (+7/-2) src/Ubuntu/UbuntuToolkit/timeutils_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/tree.cpp (+2/-3) src/Ubuntu/UbuntuToolkit/tree.h (+2/-2) src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h (+28/-0) src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+277/-0) src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h (+73/-0) src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucabstractbutton.h (+11/-2) src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h (+4/-1) src/Ubuntu/UbuntuToolkit/ucaction.cpp (+5/-1) src/Ubuntu/UbuntuToolkit/ucaction.h (+11/-4) src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucactioncontext.h (+15/-9) src/Ubuntu/UbuntuToolkit/ucactionitem.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucactionitem.h (+9/-1) src/Ubuntu/UbuntuToolkit/ucactionitem_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucactionmanager.h (+13/-8) src/Ubuntu/UbuntuToolkit/ucalarm.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucalarm.h (+6/-2) src/Ubuntu/UbuntuToolkit/ucalarm_p.h (+5/-1) src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucalarmmodel.h (+6/-2) src/Ubuntu/UbuntuToolkit/ucapplication.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucapplication.h (+6/-1) src/Ubuntu/UbuntuToolkit/ucargument.cpp (+3/-1) src/Ubuntu/UbuntuToolkit/ucargument.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucarguments.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucarguments.h (+7/-3) src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp (+4/-4) src/Ubuntu/UbuntuToolkit/ucbottomedge.h (+16/-10) src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h (+5/-5) src/Ubuntu/UbuntuToolkit/ucbottomedgehint.cpp (+9/-5) src/Ubuntu/UbuntuToolkit/ucbottomedgehint.h (+13/-3) src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h (+11/-5) src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp (+9/-4) src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.h (+8/-3) src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h (+6/-5) src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.h (+7/-1) src/Ubuntu/UbuntuToolkit/ucdefaulttheme.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucdefaulttheme.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.h (+8/-2) src/Ubuntu/UbuntuToolkit/ucfontutils.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucfontutils.h (+6/-1) src/Ubuntu/UbuntuToolkit/uchaptics.cpp (+7/-3) src/Ubuntu/UbuntuToolkit/uchaptics.h (+9/-4) src/Ubuntu/UbuntuToolkit/ucheader.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucheader.h (+6/-2) src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucinversemouse.h (+10/-4) src/Ubuntu/UbuntuToolkit/uclabel.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/uclabel.h (+8/-3) src/Ubuntu/UbuntuToolkit/uclistitem.cpp (+8/-6) src/Ubuntu/UbuntuToolkit/uclistitem.h (+31/-8) src/Ubuntu/UbuntuToolkit/uclistitem_p.h (+5/-0) src/Ubuntu/UbuntuToolkit/uclistitemactions.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/uclistitemactions.h (+7/-2) src/Ubuntu/UbuntuToolkit/uclistitemactions_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/uclistitemlayout.h (+12/-1) src/Ubuntu/UbuntuToolkit/uclistitemstyle.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/uclistitemstyle.h (+14/-8) src/Ubuntu/UbuntuToolkit/ucmainviewbase.cpp (+7/-3) src/Ubuntu/UbuntuToolkit/ucmainviewbase.h (+16/-1) src/Ubuntu/UbuntuToolkit/ucmainviewbase_p.h (+4/-1) src/Ubuntu/UbuntuToolkit/ucmargins.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucmathutils.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucmathutils.h (+6/-1) src/Ubuntu/UbuntuToolkit/ucmouse.h (+13/-6) src/Ubuntu/UbuntuToolkit/ucmousefilters.cpp (+2/-3) src/Ubuntu/UbuntuToolkit/ucpagetreenode.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucpagetreenode.h (+13/-1) src/Ubuntu/UbuntuToolkit/ucpagetreenode_p.h (+4/-1) src/Ubuntu/UbuntuToolkit/ucperformancemonitor.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucperformancemonitor.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucproportionalshape.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucproportionalshape.h (+6/-2) src/Ubuntu/UbuntuToolkit/ucqquickimageextension.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucqquickimageextension.h (+7/-1) src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucserviceproperties.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucserviceproperties.h (+6/-1) src/Ubuntu/UbuntuToolkit/ucserviceproperties_p.h (+5/-1) src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucslotslayout.h (+22/-4) src/Ubuntu/UbuntuToolkit/ucslotslayout_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/ucstatesaver.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucstatesaver.h (+8/-3) src/Ubuntu/UbuntuToolkit/ucstatesaver_p.h (+4/-0) src/Ubuntu/UbuntuToolkit/ucstyleditembase.cpp (+6/-3) src/Ubuntu/UbuntuToolkit/ucstyleditembase.h (+8/-3) src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucstylehints.cpp (+5/-4) src/Ubuntu/UbuntuToolkit/ucstylehints.h (+10/-7) src/Ubuntu/UbuntuToolkit/uctheme.cpp (+5/-1) src/Ubuntu/UbuntuToolkit/uctheme.h (+11/-3) src/Ubuntu/UbuntuToolkit/ucthemingextension.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucthemingextension.h (+8/-2) src/Ubuntu/UbuntuToolkit/ucubuntuanimation.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucubuntuanimation.h (+7/-2) src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp (+6/-1) src/Ubuntu/UbuntuToolkit/ucubuntushape.h (+6/-2) src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.h (+6/-2) src/Ubuntu/UbuntuToolkit/ucubuntushapetextures.h (+4/-0) src/Ubuntu/UbuntuToolkit/ucunits.cpp (+4/-1) src/Ubuntu/UbuntuToolkit/ucunits.h (+7/-1) src/Ubuntu/UbuntuToolkit/ucurihandler.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/ucurihandler.h (+12/-3) src/Ubuntu/UbuntuToolkit/ucviewitemsattached.cpp (+5/-1) src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.h (+7/-2) src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.cpp (+4/-0) src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.h (+6/-0) src/src.pro (+1/-1) sync.profile (+5/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py (+2/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+2/-1) tests/unit/alarms/tst_alarms.cpp (+7/-5) tests/unit/animator/tst_animator.cpp (+2/-0) tests/unit/argument/tst_argument.cpp (+2/-0) tests/unit/arguments/tst_arguments.cpp (+2/-0) tests/unit/asyncloader/tst_asyncloader.cpp (+42/-40) tests/unit/bottomedge/tst_bottomedge.cpp (+10/-8) tests/unit/custom_qpa/main.cpp (+1/-1) tests/unit/deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+4/-2) tests/unit/i18n/LocalizedApp/src/tst_i18n_LocalizedApp.cpp (+5/-3) tests/unit/i18n/RelativeTime/src/tst_i18n_RelativeTime.cpp (+5/-3) tests/unit/iconprovider/tst_iconprovider.cpp (+3/-1) tests/unit/inversemousearea/tst_inversemouseareatest.cpp (+1/-0) tests/unit/layouts/tst_layouts.cpp (+2/-0) tests/unit/mainview/tst_mainview.cpp (+4/-2) tests/unit/mousefilters/tst_mousefilterstest.cpp (+5/-3) tests/unit/qquick_image_extension/tst_qquick_image_extension.cpp (+4/-2) tests/unit/quickutils/tst_quickutils.cpp (+2/-0) tests/unit/scaling_image_provider/tst_scaling_image_provider.cpp (+2/-0) tests/unit/serviceproperties/tst_serviceproperties.cpp (+3/-1) tests/unit/statesaver/tst_statesaver.cpp (+5/-3) tests/unit/subtheming/tst_subtheming.cpp (+8/-6) tests/unit/swipearea/GestureTest.cpp (+1/-1) tests/unit/swipearea/GestureTest.h (+3/-4) tests/unit/swipearea/tst_swipearea.cpp (+101/-101) tests/unit/test-include-x11.pri (+1/-1) tests/unit/test-include.pri (+1/-1) tests/unit/touchregistry/tst_TouchRegistry.cpp (+4/-2) tests/unit/tree/tst_tree.cpp (+18/-16) tests/unit/units/dpr1/tst_units.cpp (+2/-0) tests/unit/units/dpr2/tst_units_dpr2.cpp (+2/-0) tests/unit/units/dpr3/tst_units_dpr3.cpp (+2/-0) tests/unit/units/scale/tst_units_scale.cpp (+2/-0) ubuntu-sdk.pro (+1/-0) ubuntu-ui-toolkit-launcher/launcher.cpp (+2/-2)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-06-22
Benjamin Zeller (community)		2016-06-08	Approve on 2016-06-22
Review via email: mp+296802@code.launchpad.net

Commit Message

Move C++ components into UbuntuToolkit library.

Description of the Change

Move C++ components into UbuntuToolkit library.

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-17:

FAILED: Continuous integration, rev:2004
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/707/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3886/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/707/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-17:

FAILED: Continuous integration, rev:2004
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/951/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3887/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/951/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-17:

FAILED: Continuous integration, rev:2004
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/733/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3888/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/733/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-17:

FAILED: Continuous integration, rev:2004
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/922/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3889/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/922/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-17:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/464/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-20

2005. By Zsombor Egri on 2016-06-20: fix install

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2005
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/924/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3895/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/924/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2005
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/709/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3896/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/709/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2005
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/735/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3897/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/735/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2005
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/953/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3898/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/953/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/465/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-20

2006. By Zsombor Egri on 2016-06-20: move module initialization and type registrations into the library modules

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2006
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/925/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3900/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/925/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2006
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/710/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3901/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/710/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2006
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/954/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3902/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/954/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2006
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/736/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3903/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/736/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/466/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-20

2007. By Zsombor Egri on 2016-06-20: fix AP namespace

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2007
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/926/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3905/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/926/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2007
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/711/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3906/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/711/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2007
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/955/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3907/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/955/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2007
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/737/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3908/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/737/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/467/rebuild

review: Needs Fixing (continuous-integration)

Benjamin Zeller (zeller-benjamin) wrote on 2016-06-20:

Just one small inline comment

review: Needs Fixing

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-20

2008. By Zsombor Egri on 2016-06-20: build fixes

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2008
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/927/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3910/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/927/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2008
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/712/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3911/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/712/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2008
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/738/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3912/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/738/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2008
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/956/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3913/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/956/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/468/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-20

2009. By Zsombor Egri on 2016-06-20: API and test updated

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2009
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/931/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3925/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/931/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2009
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/716/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3926/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/716/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2009
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/742/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3931/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/742/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

FAILED: Continuous integration, rev:2009
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/960/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3932/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/960/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/471/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-21

2010. By Zsombor Egri on 2016-06-21: fix pep8 hysteria

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2010
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/934/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3943/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/934/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2010
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/719/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3944/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/719/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2010
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/964/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3945/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/964/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2010
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/745/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3946/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/745/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/472/rebuild

review: Needs Fixing (continuous-integration)

Zsombor Egri (zsombi) wrote on 2016-06-21:

Replied on the comments

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-21

2011. By Zsombor Egri on 2016-06-21: approach fixing qdoc

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2011
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/935/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3948/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/935/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2011
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/720/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3949/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/720/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2011
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/746/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3950/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/746/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2011
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/965/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3951/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/965/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/473/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-21

2012. By Zsombor Egri on 2016-06-21: fix macros in propertiwes/signals for qdoc

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2012
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/940/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3972/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/940/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2012
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/725/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3973/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/725/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2012
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/751/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3974/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/751/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2012
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/970/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3975/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/970/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/477/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-21

2013. By Zsombor Egri on 2016-06-21: fixing qdoc
2014. By Zsombor Egri on 2016-06-21: fix namespace for UbuntuGestures module

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2014
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/941/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3977/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/941/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2014
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/726/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3978/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/726/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2014
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/971/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3979/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/971/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2014
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/752/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3980/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/752/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/478/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-21

2015. By Zsombor Egri on 2016-06-21: please ancient pep8

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2015
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/942/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3982/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/942/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2015
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/727/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3983/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/727/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2015
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/972/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3984/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/972/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

FAILED: Continuous integration, rev:2015
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/753/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3985/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/753/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/479/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-22

2016. By Zsombor Egri on 2016-06-22: fix forward-headers
2017. By Zsombor Egri on 2016-06-22: fixing last bits on install, removing duplicate gesture classes and unneeded gesture include

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

FAILED: Continuous integration, rev:2017
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/729/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3991/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/729/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2017
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/974/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3992/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/974/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2017
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/755/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3993/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/755/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2017
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/944/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3994/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/944/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/480/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated on 2016-06-22

2018. By Zsombor Egri on 2016-06-22: fix template functions

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/756/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3996/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/756/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/975/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3997/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/975/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/730/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3998/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/730/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/945/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3999/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/945/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/481/rebuild

review: Approve (continuous-integration)

Benjamin Zeller (zeller-benjamin) wrote on 2016-06-22:

Its done, all hail to Zsombor :D

review: Approve

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/976/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4001/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/976/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/757/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4002/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/757/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/946/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4003/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/946/rebuild

review: Approve (continuous-integration)

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-06-22:

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/731/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4004/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/731/rebuild

review: Approve (continuous-integration)

Andrea Bernabei (faenil) wrote on 2016-06-22:

booom. Well done Zsombor! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

 === modified file '.qmake.conf'
 --- .qmake.conf	2016-05-13 09:11:23 +0000
 +++ .qmake.conf	2016-06-22 15:52:01 +0000
@@ -23,3 +23,8 @@
          QMAKE_CXXFLAGS += -Wsuggest-override
+     }
+ }
++
++# build UbuntuToolkit with or without namespace
++DEFINES += UBUNTUTOOLKIT_NAMESPACE
++# build UbuntuGestures with or without namespace
++DEFINES += UBUNTUGESTURES_NAMESPACE
 === modified file 'components.api'
 --- components.api	2016-06-14 10:04:01 +0000
 +++ components.api	2016-06-22 15:52:01 +0000
@@ -1,15 +1,15 @@
--Ubuntu.Components.AbstractButton 1.0 0.1: ActionItem
++Ubuntu.Components.AbstractButton 1.0 0.1: UbuntuToolkit.UCActionItem
      property bool hovered
      signal clicked()
      signal pressAndHold()
      property bool pressed
--Ubuntu.Components.AbstractButton 1.3 UCAbstractButton: ActionItem
++Ubuntu.Components.AbstractButton 1.3 UbuntuToolkit::UCAbstractButton: UbuntuToolkit.UCActionItem
      readonly property bool hovered
      signal clicked()
      signal pressAndHold()
      readonly property bool pressed
--    readonly property UCMargins sensingMargins
--Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
++    readonly property UbuntuToolkit.UCMargins sensingMargins
++Ubuntu.Components.Action 1.3 1.0 0.1 UbuntuToolkit::UCAction: QtObject
      property string description
      property bool enabled
      property string iconName
@@ -24,15 +24,8 @@
      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
++Ubuntu.Components.ActionBar 1.3: UbuntuToolkit.UCStyledItemBase
++    property list<UbuntuToolki>.UCAction> actions
      property Component delegate
      property int numberOfSlots
  Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
@@ -41,13 +34,13 @@
      property string overflowIconName
      property url overflowIconSource
      property string overflowText
--Ubuntu.Components.ActionContext 1.0 0.1 UCActionContext: QtObject
--    default property list<Action> actions
++Ubuntu.Components.ActionContext 1.0 0.1 UbuntuToolkit::UCActionContext: QtObject
++    default property list<UbuntuToolki>.UCAction> actions
      property bool active
--    function addAction(Action action)
--    function removeAction(Action action)
--Ubuntu.Components.ActionItem 1.0 0.1 UCActionItem: StyledItem
--    property Action action
++    function addAction(UbuntuToolkit.UCAction action)
++    function removeAction(UbuntuToolkit.UCAction action)
++Ubuntu.Components.ActionItem 1.0 0.1 UbuntuToolkit::UCActionItem: UbuntuToolkit.UCStyledItemBase
++    property UbuntuToolkit.UCAction action
      property string iconName
      property url iconSource
      signal triggered(var value)
@@ -55,20 +48,20 @@
      function trigger()
      property string text
  Ubuntu.Components.ActionList 1.0 0.1: QtObject
--    property list<Action> actions
--    default property list<Action> children
++    property list<UbuntuToolki>.UCAction> actions
++    default property list<UbuntuToolki>.UCAction> children
  Ubuntu.Components.ActionList 1.3: QtObject
--    property list<Action> actions
--    default property list<Action> children
--Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject
--    default property list<Action> actions
--    readonly property ActionContext globalContext
--    property list<ActionContext> localContexts
++    property list<UbuntuToolki>.UCAction> actions
++    default property list<UbuntuToolki>.UCAction> children
++Ubuntu.Components.ActionManager 1.0 0.1 UbuntuToolkit::UCActionManager: QtObject
++    default property list<UbuntuToolki>.UCAction> actions
++    readonly property UbuntuToolkit.UCActionContext globalContext
++    property list<UbuntuToolki>.UCActionContext> localContexts
      signal quit()
--    function addAction(Action action)
--    function removeAction(Action action)
--    function addLocalContext(ActionContext context)
--    function removeLocalContext(ActionContext context)
++    function addAction(UbuntuToolkit.UCAction action)
++    function removeAction(UbuntuToolkit.UCAction action)
++    function addLocalContext(UbuntuToolkit.UCActionContext context)
++    function removeLocalContext(UbuntuToolkit.UCActionContext context)
  Ubuntu.Components.Popups.ActionSelectionPopover 1.0 0.1: Popover
      property var actions
      property Component delegate
@@ -83,7 +76,7 @@
  Ubuntu.Components.ActivityIndicator 1.3: AnimatedItem
      property bool onScreen
      property bool running
--Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
++Ubuntu.Components.AdaptivePageLayout 1.3: UbuntuToolkit.UCPageTreeNode
      property bool asynchronous
      readonly property int columns
      property list<PageColumnsLayou> layouts
@@ -92,7 +85,7 @@
      function var removePages(var page)
      property Page primaryPage
      property var primaryPageSource
--Ubuntu.Components.Alarm 1.0 0.1 UCAlarm: QtObject
++Ubuntu.Components.Alarm 1.0 0.1 UbuntuToolkit::UCAlarm: QtObject
      property QDateTime date
      property DaysOfWeek daysOfWeek
      property bool enabled
@@ -105,60 +98,19 @@
      property url sound
      readonly property Status status
      property AlarmType type
--Ubuntu.Components.Alarm.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
++Ubuntu.Components.AlarmModel 1.0 0.1 UbuntuToolkit::UCAlarmModel: QAbstractListModel
      readonly property int count
      function refresh() 1.0
--    function UCAlarm* get(int index)
--Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject
++    function UbuntuToolkit.UCAlarm* get(int index)
++Ubuntu.Components.Argument 1.0 0.1 UbuntuToolkit::UCArgument: QtObject
      property string help
      function var at(int i)
      property string name
      property bool required
      property QStringList valueNames
--Ubuntu.Components.Arguments 1.0 0.1 UCArguments: QtObject
--    default property list<Argument> arguments
--    property Argument defaultArgument
++Ubuntu.Components.Arguments 1.0 0.1 UbuntuToolkit::UCArguments: QtObject
++    default property list<UbuntuToolki>.UCArgument> arguments
++    property UbuntuToolkit.UCArgument defaultArgument
      readonly property bool error
      readonly property string errorMessage
      function printUsage()
@@ -177,20 +129,20 @@
      property var icon
      property bool iconFrame
      property bool progression
--Ubuntu.Components.BottomEdge 1.3 UCBottomEdge: StyledItem
--    readonly property BottomEdgeRegion activeRegion
++Ubuntu.Components.BottomEdge 1.3 UbuntuToolkit::UCBottomEdge: UbuntuToolkit.UCStyledItemBase
++    readonly property UbuntuToolkit.UCBottomEdgeRegion activeRegion
      property Component contentComponent
      readonly property Item contentItem
      property url contentUrl
      readonly property DragDirection dragDirection
      readonly property double dragProgress
--    readonly property BottomEdgeHint hint
++    readonly property UbuntuToolkit.UCBottomEdgeHint hint
      signal dragProgressChanged(double dragProgress)
--    signal dragDirectionChanged(BottomEdge.DragDirection direction)
--    signal statusChanged(BottomEdge.Status status)
++    signal dragDirectionChanged(UbuntuToolkit.UCBottomEdge direction)
++    signal statusChanged(UbuntuToolkit.UCBottomEdge status)
      signal contentChanged(url url)
      signal contentComponentChanged(Component component)
--    signal activeRegionChanged(BottomEdgeRegion activeRegion)
++    signal activeRegionChanged(UbuntuToolkit.UCBottomEdgeRegion activeRegion)
      signal commitStarted()
      signal commitCompleted()
      signal collapseStarted()
@@ -198,28 +150,15 @@
      function commit()
      function collapse()
      property bool preloadContent
--    property list<BottomEdgeRegion> regions
++    property list<UbuntuToolki>.UCBottomEdgeRegion> 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
++Ubuntu.Components.BottomEdgeHint 1.3 UbuntuToolkit::UCBottomEdgeHint: UbuntuToolkit.UCActionItem
      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
++    readonly property UbuntuGestures.UCSwipeArea swipeArea
++Ubuntu.Components.BottomEdgeRegion 1.3 UbuntuToolkit::UCBottomEdgeRegion: QtObject
      property Component contentComponent
      property url contentUrl
      property bool enabled
@@ -230,7 +169,7 @@
      signal exited()
      signal dragEnded()
      property double to
--Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UCBottomEdgeStyle: Item
++Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UbuntuToolkit::UCBottomEdgeStyle: Item
      property Item contentItem
      property Item panel
      property Animation panelAnimation
@@ -246,7 +185,7 @@
      property Gradient gradient
      property string iconPosition
      property color strokeColor
--Ubuntu.Components.Button 1.3: AbstractButton
++Ubuntu.Components.Button 1.3: UbuntuToolkit.UCAbstractButton
      property color color
      property QFont font
      property Gradient gradient
@@ -262,17 +201,17 @@
      readonly property Label title
  Ubuntu.Components.Captions 1.3: ColumnLayout
      property int captionStyle
--    readonly property Label subtitle
--    readonly property Label title
++    readonly property UbuntuToolkit.UCLabel subtitle
++    readonly property UbuntuToolkit.UCLabel title
  Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton
      property bool checked
--Ubuntu.Components.CheckBox 1.3: AbstractButton
++Ubuntu.Components.CheckBox 1.3: UbuntuToolkit.UCAbstractButton
      property bool checked
  Ubuntu.Components.Clipboard 1.0 0.1: QtObject singleton
--    readonly property MimeData data
++    readonly property UbuntuToolkit.QQuickMimeData data
      function push(var data)
      function clear()
--    function QQuickMimeData* newData()
++    function UbuntuToolkit.QQuickMimeData* newData()
  Ubuntu.Components.ColorUtils 1.0 0.1: QtObject singleton
      function double luminance(color color)
  Ubuntu.Components.ComboButton 1.1: Button
@@ -282,7 +221,7 @@
      property color dropdownColor
      property bool expanded
      property double expandedHeight
--Ubuntu.Components.ComboButton 1.3: AbstractButton
++Ubuntu.Components.ComboButton 1.3: UbuntuToolkit.UCAbstractButton
      property double collapsedHeight
      property color color
      default property list<QtObject> comboList
@@ -341,7 +280,7 @@
      property url source
      property QSizeF sourceSize
      readonly property int status
--Ubuntu.Components.Pickers.DatePicker 1.0 0.1: StyledItem
++Ubuntu.Components.Pickers.DatePicker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
      property QDateTime date
      readonly property int day
      readonly property int hours
@@ -355,7 +294,7 @@
      readonly property int seconds
      readonly property int week
      readonly property int year
--Ubuntu.Components.Pickers.DatePicker 1.3: StyledItem
++Ubuntu.Components.Pickers.DatePicker 1.3: UbuntuToolkit.UCStyledItemBase
      property QDateTime date
      readonly property int day
      readonly property int hours
@@ -378,31 +317,31 @@
      property bool doneButton
      signal closeClicked()
      signal doneClicked()
--Ubuntu.Components.Pickers.Dialer 1.0 0.1: StyledItem
--    property list<QtObject> centerContent
--    readonly property Item centerItem
--    property double handSpace
--    readonly property var hands
--    property double maximumValue
--    signal handUpdated(var hand)
--    property double minimumValue
--    property double size
--Ubuntu.Components.Pickers.Dialer 1.3: StyledItem
--    property list<QtObject> centerContent
--    readonly property Item centerItem
--    property double handSpace
--    readonly property var hands
--    property double maximumValue
--    signal handUpdated(var hand)
--    property double minimumValue
--    property double size
--Ubuntu.Components.Pickers.DialerHand 1.0 0.1: StyledItem
++Ubuntu.Components.Pickers.Dialer 1.0 0.1: UbuntuToolkit.UCStyledItemBase
++    property list<QtObject> centerContent
++    readonly property Item centerItem
++    property double handSpace
++    readonly property var hands
++    property double maximumValue
++    signal handUpdated(var hand)
++    property double minimumValue
++    property double size
++Ubuntu.Components.Pickers.Dialer 1.3: UbuntuToolkit.UCStyledItemBase
++    property list<QtObject> centerContent
++    readonly property Item centerItem
++    property double handSpace
++    readonly property var hands
++    property double maximumValue
++    signal handUpdated(var hand)
++    property double minimumValue
++    property double size
++Ubuntu.Components.Pickers.DialerHand 1.0 0.1: UbuntuToolkit.UCStyledItemBase
      readonly property Dialer dialer
      property DialerHandGroup hand
      readonly property int index
      default property list<QtObject> overlay
      property double value
--Ubuntu.Components.Pickers.DialerHand 1.3: StyledItem
++Ubuntu.Components.Pickers.DialerHand 1.3: UbuntuToolkit.UCStyledItemBase
      readonly property Dialer dialer
      property DialerHandGroup hand
      readonly property int index
@@ -428,7 +367,7 @@
      property Component style
      property string styleName
      property string text
--    property ThemeSettings theme
++    property UbuntuToolkit.UCTheme theme
      property string title
  Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
  Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
@@ -444,7 +383,7 @@
      property bool showDivider
      readonly property string swipingState
      readonly property bool waitingConfirmationForRemoval
--Ubuntu.Components.ListItems.Empty 1.3: AbstractButton
++Ubuntu.Components.ListItems.Empty 1.3: UbuntuToolkit.UCAbstractButton
      property list<Item> backgroundIndicator
      property bool confirmRemoval
      readonly property ThinDivider divider
@@ -502,7 +441,7 @@
      property bool useDeprecatedToolbar
  Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
      property string text
--Ubuntu.Components.Header 1.3 UCHeader: StyledItem
++Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: UbuntuToolkit.UCStyledItemBase
      property bool exposed
      property Flickable flickable
      readonly property bool moving
@@ -518,8 +457,8 @@
      property color keyColor
      property string name
      property url source
--Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
--Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
++Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: UbuntuToolkit.UCMouse
++Ubuntu.Components.InverseMouseArea 1.0 0.1 UbuntuToolkit::InverseMouseAreaType: MouseArea
      function bool contains(QPointF point)
      property Item sensingArea
      property bool topmostItem
@@ -551,31 +490,24 @@
      property int selectedIndex
  Ubuntu.Components.Label 1.0 0.1: Text
      property string fontSize
--Ubuntu.Components.Label 1.3 UCLabel: Text
++Ubuntu.Components.Label 1.3 UbuntuToolkit::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
--Ubuntu.Components.ListItem 1.3 1.2 UCListItem: StyledItem
--    property Action action
++Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: UbuntuToolkit.UCStyledItemBase
++    property UbuntuToolkit.UCAction action
      property color color
      readonly property Item contentItem
      readonly property bool contentMoving
--    readonly property UCListItemDivider divider
++    readonly property UbuntuToolkit.UCListItemDivider divider
      property bool dragMode
      readonly property bool dragging
--    readonly property UCListItemExpansion expansion 1.3
++    readonly property UbuntuToolkit.UCListItemExpansion expansion 1.3
      property color highlightColor
      readonly property bool highlighted
--    property ListItemActions leadingActions
++    property UbuntuToolkit.UCListItemActions leadingActions
      property list<Item> listItemChildren
      default property list<QtObject> listItemData
      signal clicked()
@@ -586,9 +518,9 @@
      property bool selected
      property bool swipeEnabled 1.3
      readonly property bool swiped 1.3
--    property ListItemActions trailingActions
--Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject
--    property list<Action> actions
++    property UbuntuToolkit.UCListItemActions trailingActions
++Ubuntu.Components.ListItemActions 1.2 UbuntuToolkit::UCListItemActions: QtObject
++    property list<UbuntuToolki>.UCAction> actions
      default property list<QtObject> data
      property Component delegate
  Ubuntu.Components.ListItemDrag 1.2: QtObject
@@ -598,33 +530,23 @@
      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
--    readonly property Label title
--Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UCListItemStyle: Item
++Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: UbuntuToolkit.UCSlotsLayout
++    readonly property UbuntuToolkit.UCLabel subtitle
++    readonly property UbuntuToolkit.UCLabel summary
++    readonly property UbuntuToolkit.UCLabel title
++Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UbuntuToolkit::UCListItemStyle: Item
      readonly property bool animatePanels
      property Item dragPanel
      property PropertyAnimation dropAnimation
      readonly property Flickable flickable 1.3
      readonly property int listItemIndex 1.3
--    function swipeEvent(SwipeEvent event)
++    function swipeEvent(UCSwipeEvent event)
      function rebound()
      property Animation snapAnimation
--Ubuntu.Components.LiveTimer 1.3 LiveTimer: QtObject
++Ubuntu.Components.LiveTimer 1.3 UbuntuToolkit::LiveTimer: QtObject
      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
@@ -632,13 +554,13 @@
  Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
      property bool automaticOrientation
      default property list<QtObject> contentsItem
--Ubuntu.Components.MainView 1.3: MainViewBase
++Ubuntu.Components.MainView 1.3: UbuntuToolkit.UCMainViewBase
      property bool automaticOrientation
      default property list<QtObject> contentsItem
--Ubuntu.Components.MainViewBase 1.3 UCMainViewBase: PageTreeNode
--    readonly property PopupContext actionContext
--    readonly property ActionManager actionManager
--    property list<Action> actions
++Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: UbuntuToolkit.UCPageTreeNode
++    readonly property UbuntuToolkit.UCPopupContext actionContext
++    readonly property UbuntuToolkit.UCActionManager actionManager
++    property list<UbuntuToolki>.UCAction> actions
      property bool anchorToKeyboard
      property string applicationName
      property color backgroundColor
@@ -649,21 +571,21 @@
      signal headerColorChanged(color headerColor)
      signal backgroundColorChanged(color backgroundColor)
      signal footerColorChanged(color footerColor)
--    signal actionManagerChanged(ActionManager actionManager)
--    signal actionContextChanged(PopupContext actionContext)
++    signal actionManagerChanged(UbuntuToolkit.UCActionManager actionManager)
++    signal actionContextChanged(UbuntuToolkit.UCPopupContext actionContext)
  Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
      function double clamp(double x, double min, double max)
      function double lerp(double delta, double from, double to)
      function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
      function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
--Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject
++Ubuntu.Components.MimeData 1.0 0.1 UbuntuToolkit::QQuickMimeData: QtObject
      property color color
      property var data
      readonly property QStringList formats
      property string html
      property string text
      property list<url> urls
--Ubuntu.Components.Mouse 1.0 0.1 UCMouse: QtObject
++Ubuntu.Components.Mouse 1.0 0.1 UbuntuToolkit::UCMouse: QtObject
      readonly property Qt.MouseButtons acceptedButtons
      property int clickAndHoldThreshold
      property bool enabled
@@ -679,9 +601,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)
@@ -744,14 +663,14 @@
      readonly property bool rotating
      property bool transitionEnabled
  Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
--    property list<Action> actions
++    property list<UbuntuToolki>.UCAction> actions
      property Flickable flickable
      property string title
      property Item tools
  Ubuntu.Components.Page 1.1 Page11: Page10
      readonly property PageHeadConfiguration head
--Ubuntu.Components.Page 1.3: PageTreeNode
--    readonly property ActionContext actionContext
++Ubuntu.Components.Page 1.3: UbuntuToolkit.UCPageTreeNode
++    readonly property UbuntuToolkit.UCActionContext actionContext
      property Flickable flickable
      readonly property PageHeadConfiguration head
      property Item header
@@ -765,15 +684,15 @@
      default property list<PageColum> data
      property bool when
  Ubuntu.Components.PageHeadConfiguration 1.1: Object
--    property list<Action> actions
--    property Action backAction
++    property list<UbuntuToolki>.UCAction> actions
++    property UbuntuToolkit.UCAction backAction
      property Item contents
      property color foregroundColor
      property string preset
      readonly property PageHeadSections sections
  Ubuntu.Components.PageHeadConfiguration 1.3: Object
--    property list<Action> actions
--    property Action backAction
++    property list<UbuntuToolki>.UCAction> actions
++    property UbuntuToolkit.UCAction backAction
      property Item contents
      property Flickable flickable
      property color foregroundColor
@@ -787,18 +706,18 @@
      property var model
      property int selectedIndex
  Ubuntu.Components.PageHeadSections 1.3: QtObject
--    property list<Action> actions
++    property list<UbuntuToolki>.UCAction> actions
      property bool enabled
      property var model
      property int selectedIndex
  Ubuntu.Components.PageHeadState 1.1: State
--    property list<Action> actions
--    property Action backAction
++    property list<UbuntuToolki>.UCAction> actions
++    property UbuntuToolkit.UCAction backAction
      property Item contents
      property PageHeadConfiguration head
  Ubuntu.Components.PageHeadState 1.3: State
--    property list<Action> actions
--    property Action backAction
++    property list<UbuntuToolki>.UCAction> actions
++    property UbuntuToolkit.UCAction backAction
      property Item contents
      property PageHeadConfiguration head
  Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
@@ -820,11 +739,11 @@
      property color textColor
      property double textLeftMargin
      property int textSize
--Ubuntu.Components.PageHeader 1.3: Header
++Ubuntu.Components.PageHeader 1.3: UbuntuToolkit.UCHeader
      property Item contents
      property Item extension
      readonly property ActionBar leadingActionBar
--    property list<Action> navigationActions
++    property list<UbuntuToolki>.UCAction> navigationActions
      readonly property Sections sections
      property string subtitle
      property string title
@@ -845,19 +764,19 @@
      function var push(var page, var properties)
      function var pop()
      function var clear()
--Ubuntu.Components.PageStack 1.3: PageTreeNode
++Ubuntu.Components.PageStack 1.3: UbuntuToolkit.UCPageTreeNode
      property Item currentPage
      property int depth
      function var push(var page, var properties)
      function var pop()
      function var clear()
--Ubuntu.Components.PageTreeNode 1.3 UCPageTreeNode: StyledItem
++Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: UbuntuToolkit.UCStyledItemBase
      property bool active
      readonly property Item activeLeafNode
      property bool isLeaf
      signal isLeafChanged(bool isLeaf)
      signal activeChanged(bool active)
--    signal parentNodeChanged(PageTreeNode parentNode)
++    signal parentNodeChanged(UbuntuToolkit.UCPageTreeNode parentNode)
      signal pageStackChanged(Item pageStack)
      signal activeLeafNodeChanged(Item activeLeafNode)
      signal propagatedChanged(QtObject propagated)
@@ -865,7 +784,7 @@
      signal isPageTreeNodeChanged(bool isPageTreeNode)
      function dumpNodeTree()
      property Item pageStack
--    property PageTreeNode parentNode
++    property UbuntuToolkit.UCPageTreeNode parentNode
      property Item toolbar
  Ubuntu.Components.Themes.Palette 0.1: QtObject
      property PaletteValues normal
@@ -948,7 +867,7 @@
      property double triggerSize
  Ubuntu.PerformanceMetrics.PerformanceOverlay 1.0 0.1: Item
      property bool active
--Ubuntu.Components.Pickers.Picker 1.0 0.1: StyledItem
++Ubuntu.Components.Pickers.Picker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
      property bool circular
      property Component delegate
      property bool live
@@ -956,7 +875,7 @@
      property var model
      readonly property bool moving
      property int selectedIndex
--Ubuntu.Components.Pickers.Picker 1.3: StyledItem
++Ubuntu.Components.Pickers.Picker 1.3: UbuntuToolkit.UCStyledItemBase
      property bool circular
      property Component delegate
      property double itemHeight
@@ -967,7 +886,7 @@
      property int selectedIndex
  Ubuntu.Components.Pickers.PickerDelegate 1.0 0.1: AbstractButton
      readonly property Picker picker
--Ubuntu.Components.Pickers.PickerDelegate 1.3: AbstractButton
++Ubuntu.Components.Pickers.PickerDelegate 1.3: UbuntuToolkit.UCAbstractButton
      readonly property Picker picker
  Ubuntu.Components.Pickers.PickerPanel 1.0 0.1: Object singleton
      function var openDatePicker(var caller, var property, var mode)
@@ -999,7 +918,7 @@
      property Item pointerTarget
      property Component style
      property string styleName
--    property ThemeSettings theme
++    property UbuntuToolkit.UCTheme theme
  Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
      property Item dismissArea
      property PropertyAnimation fadingAnimation
@@ -1012,7 +931,7 @@
      property bool grabDismissAreaEvents
      function var show()
      function var hide()
--Ubuntu.Components.PopupContext 1.3 UCPopupContext: ActionContext
++Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: UbuntuToolkit.UCActionContext
  Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
  Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
      property bool indeterminate
@@ -1035,15 +954,15 @@
      property color keyColor
      property string name
      property url source
--Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
--Ubuntu.Components.PullToRefresh 1.1: StyledItem
++Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuToolkit.UCUbuntuShape
++Ubuntu.Components.PullToRefresh 1.1: UbuntuToolkit.UCStyledItemBase
      property Component content
      signal refresh()
      readonly property double offset
      property bool refreshing
      readonly property bool releaseToRefresh
      property Flickable target
--Ubuntu.Components.PullToRefresh 1.3: StyledItem
++Ubuntu.Components.PullToRefresh 1.3: UbuntuToolkit.UCStyledItemBase
      property Component content
      signal refresh()
      readonly property double offset
@@ -1054,26 +973,27 @@
      property double activationThreshold
      property Component defaultContent
      property bool releaseToRefresh
++Ubuntu.Components.QQuickImageBase 1.0 0.1 UbuntuToolkit::UCQQuickImageExtension: QQuickImageBase
  Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
      readonly property UPMGraphModel graphModel
      signal frameRendered(qlonglong renderTime)
      property int period
      property int samples
      property RenderTimer.TimerType timerType
--Ubuntu.Components.ScrollView 1.3: StyledItem
++Ubuntu.Components.ScrollView 1.3: UbuntuToolkit.UCStyledItemBase
      default property Item contentItem
      readonly property Flickable flickableItem
      property Scrollbar horizontalScrollbar
      property Scrollbar verticalScrollbar
      readonly property Item viewport
--Ubuntu.Components.Scrollbar 1.0 0.1: StyledItem
--    property int align
--    property Flickable flickableItem
--Ubuntu.Components.Scrollbar 1.3: StyledItem
--    property int align
--    property Flickable flickableItem
--Ubuntu.Components.Sections 1.3: StyledItem
--    property list<Action> actions
++Ubuntu.Components.Scrollbar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
++    property int align
++    property Flickable flickableItem
++Ubuntu.Components.Scrollbar 1.3: UbuntuToolkit.UCStyledItemBase
++    property int align
++    property Flickable flickableItem
++Ubuntu.Components.Sections 1.3: UbuntuToolkit.UCStyledItemBase
++    property list<UbuntuToolki>.UCAction> actions
      property var model
      property int selectedIndex
  Ubuntu.Components.Styles.SectionsStyle 1.3: Item
@@ -1082,7 +1002,7 @@
      property color selectedSectionColor
      property int textSize
      property color underlineColor
--Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject
++Ubuntu.Components.ServiceProperties 1.1 UbuntuToolkit::UCServiceProperties: QtObject
      property string adaptorInterface 1.1
      readonly property string error 1.1
      property string path 1.1
@@ -1090,15 +1010,6 @@
      property string serviceInterface 1.1
      readonly property Status status 1.1
      property ServiceType type 1.1
--Ubuntu.Components.ServiceProperties.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
@@ -1119,7 +1030,7 @@
      property string value
  Ubuntu.Components.ListItems.SingleValue 1.3: Base
      property string value
--Ubuntu.Components.Slider 1.0 0.1: StyledItem
++Ubuntu.Components.Slider 1.0 0.1: UbuntuToolkit.UCStyledItemBase
      property bool live
      property double maximumValue
      signal touched(bool onThumb)
@@ -1127,7 +1038,7 @@
      property double minimumValue
      readonly property bool pressed
      property double value
--Ubuntu.Components.Slider 1.3: StyledItem
++Ubuntu.Components.Slider 1.3: UbuntuToolkit.UCStyledItemBase
      property bool live
      property double maximumValue
      signal touched(bool onThumb)
@@ -1139,16 +1050,11 @@
  Ubuntu.Components.SliderUtils 0.1 1.0
  Ubuntu.Components.SlotsAttached 1.3: QtObject
      property bool overrideVerticalPositioning
--    readonly property SlotsLayoutPadding padding
--    property SlotsLayout.UCSlotPosition position
--Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item
++    readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
++    property UbuntuToolkit.UCSlotsLayout position
++Ubuntu.Components.SlotsLayout 1.3 UbuntuToolkit::UCSlotsLayout: Item
      property Item mainSlot
--    readonly property SlotsLayoutPadding padding
--Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
--    First
--    Last
--    Leading
--    Trailing
++    readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
  Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject
      property double bottom
      property double leading
@@ -1157,13 +1063,13 @@
  Ubuntu.Components.SortBehavior 1.1: QtObject
      property Qt.SortOrder order
      property string property
--Ubuntu.Components.SortFilterModel 1.1 QSortFilterProxyModelQML: QSortFilterProxyModel
++Ubuntu.Components.SortFilterModel 1.1 UbuntuToolkit::QSortFilterProxyModelQML: QSortFilterProxyModel
      readonly property int count
--    readonly property FilterBehavior filter
++    readonly property UbuntuToolkit.FilterBehavior filter
      function QVariantMap get(int row)
      function int count()
      property QAbstractItemModel model
--    readonly property SortBehavior sort
++    readonly property UbuntuToolkit.SortBehavior sort
  Ubuntu.Components.ListItems.Standard 1.0 0.1: Empty
      property Item control
      property string fallbackIconName
@@ -1178,10 +1084,10 @@
      property var icon
      property bool iconFrame
      property bool progression
--Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject
--Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject
++Ubuntu.Components.StateSaver 1.0 0.1 UbuntuToolkit::UCStateSaver: QtObject
++Ubuntu.Components.StyleHints 1.3 UbuntuToolkit::UCStyleHints: QtObject
      property bool ignoreUnknownProperties
--Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item
++Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UbuntuToolkit::UCStyledItemBase: Item
      property bool activeFocusOnPress 1.3
      readonly property bool keyNavigationFocus 1.3
      signal activeFocusOnTabChanged2() 1.3
@@ -1189,12 +1095,12 @@
      function bool requestFocus() 1.3
      property Component style
      property string styleName 1.3
--    property ThemeSettings theme 1.3
++    property UbuntuToolkit.UCTheme theme 1.3
  Ubuntu.Components.ListItems.Subtitled 1.0 0.1: Base
      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
@@ -1209,37 +1115,26 @@
      signal grabGestureChanged(bool grabGesture)
      readonly property bool pressed
      readonly property QPointF touchPosition
--Ubuntu.Components.SwipeArea.Direction: Enum
--    Downwards
--    Horizontal
--    Leftwards
--    Rightwards
--    Upwards
--    Vertical
  Ubuntu.Components.SwipeEvent 1.2: QtObject
      property QPointF content
      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
++Ubuntu.Components.Switch 1.3: UbuntuToolkit.UCAbstractButton
      property bool checked
  Ubuntu.Components.Tab 1.0 0.1: PageTreeNode
      property url iconSource
      readonly property int index
      property Item page
      property string title
--Ubuntu.Components.Tab 1.3: PageTreeNode
++Ubuntu.Components.Tab 1.3: UbuntuToolkit.UCPageTreeNode
      property url iconSource
      readonly property int index
      property Item page
      property string title
--Ubuntu.Components.TabBar 1.0 0.1: StyledItem
++Ubuntu.Components.TabBar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
      property bool alwaysSelectionMode
      property bool animate
      property var model
@@ -1247,7 +1142,7 @@
      property int selectedIndex
      property bool selectionMode
      property Item tabsItem
--Ubuntu.Components.TabBar 1.3: StyledItem
++Ubuntu.Components.TabBar 1.3: UbuntuToolkit.UCStyledItemBase
      property bool alwaysSelectionMode
      property bool animate
      property var model
@@ -1262,7 +1157,7 @@
      property int selectedTabIndex
      property TabBar tabBar
      default property list<QtObject> tabChildren
--Ubuntu.Components.Tabs 1.3: PageTreeNode
++Ubuntu.Components.Tabs 1.3: UbuntuToolkit.UCPageTreeNode
      readonly property int count
      readonly property Item currentPage
      readonly property Tab selectedTab
@@ -1288,7 +1183,7 @@
      function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
      function removeTimeConstraintsFromSwipeArea(Item item)
      readonly property bool touchPresent
--Ubuntu.Components.TextArea 1.0 0.1: StyledItem
++Ubuntu.Components.TextArea 1.0 0.1: UbuntuToolkit.UCStyledItemBase
      property bool autoExpand
      property bool autoSize
      property url baseUrl
@@ -1346,7 +1241,7 @@
      property int textFormat
      property int verticalAlignment
      property int wrapMode
--Ubuntu.Components.TextArea 1.3: StyledItem
++Ubuntu.Components.TextArea 1.3: UbuntuToolkit.UCStyledItemBase
      property bool autoExpand
      property bool autoSize
      property url baseUrl
@@ -1407,7 +1302,7 @@
      property int textFormat
      property int verticalAlignment
      property int wrapMode
--Ubuntu.Components.TextField 1.0 0.1: ActionItem
++Ubuntu.Components.TextField 1.0 0.1: UbuntuToolkit.UCActionItem
      readonly property bool acceptableInput
      property bool autoScroll
      readonly property bool canPaste
@@ -1468,7 +1363,7 @@
      readonly property int selectionStart
      property QValidator validator
      property int verticalAlignment
--Ubuntu.Components.TextField 1.3: ActionItem
++Ubuntu.Components.TextField 1.3: UbuntuToolkit.UCActionItem
      readonly property bool acceptableInput
      property bool autoScroll
      readonly property bool canPaste
@@ -1531,27 +1426,27 @@
      property int verticalAlignment
  Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item
      property QImage image
--Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject
++Ubuntu.Components.ThemeSettings 1.3 UbuntuToolkit::UCTheme: QtObject
      property string name
      property QtObject palette
--    readonly property ThemeSettings parentTheme
++    readonly property UbuntuToolkit.UCTheme parentTheme
  Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
  Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
  Ubuntu.Components.Toolbar 0.1: Panel
      property Item tools
--Ubuntu.Components.Toolbar 1.3: StyledItem
++Ubuntu.Components.Toolbar 1.3: UbuntuToolkit.UCStyledItemBase
      readonly property ActionBar leadingActionBar
      readonly property ActionBar trailingActionBar
--Ubuntu.Components.ToolbarButton 1.0 0.1: StyledItem
--    property Action action
++Ubuntu.Components.ToolbarButton 1.0 0.1: UbuntuToolkit.UCStyledItemBase
++    property UbuntuToolkit.UCAction action
      property string iconName
      property url iconSource
      signal triggered(var value)
      function trigger(var value)
      function trigger()
      property string text
--Ubuntu.Components.ToolbarButton 1.3: StyledItem
--    property Action action
++Ubuntu.Components.ToolbarButton 1.3: UbuntuToolkit.UCStyledItemBase
++    property UbuntuToolkit.UCAction action
      property string iconName
      property url iconSource
      signal triggered(var value)
@@ -1572,28 +1467,12 @@
      property Item pageStack
  Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
      property Component defaultDelegate
--UCActionContextAttached: QtObject
  Ubuntu.Components.UCApplication 1.0 0.1: QtObject
      property string applicationName
      property QtObject inputMethod
  Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
      function double sizeToPixels(string size)
      function double modularScale(string size)
--UCListItemDivider: Item
--    property color colorFrom
--    property color colorTo
--UCListItemExpansion: QtObject
--    property bool expanded
--    property double height
--UCMargins: QtObject
--    property double all
--    property double bottom
--    property double left
--    property double right
--    property double top
--UCStateSaverAttached: QtObject
--    property bool enabled
--    property string properties
  Ubuntu.Components.UCUnits 1.0 0.1: QtObject
      property float gridUnit
      function float dp(float value)
@@ -1606,14 +1485,11 @@
      property int samples
      readonly property int shift
  Ubuntu.Components.Ubuntu 1.2: QtObject singleton
--Ubuntu.Components.Ubuntu 1.3: Ubuntu singleton
++Ubuntu.Components.Ubuntu 1.3: UbuntuToolkit.UCNamespace singleton
      function ushort version(uchar major, uchar minor)
      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
@@ -1668,6 +1544,13 @@
      readonly property color silk
      readonly property color slate
      readonly property color warmGrey
++Ubuntu.Components.UbuntuGestures.UCSwipeArea: Enum
++    Downwards
++    Horizontal
++    Leftwards
++    Rightwards
++    Upwards
++    Vertical
  Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
      property int expandedIndex
  Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
@@ -1677,7 +1560,7 @@
      readonly property PullToRefresh pullToRefresh
  Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation
  Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation
--Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UCUbuntuShape: Item
++Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UbuntuToolkit::UCUbuntuShape: Item
      property Aspect aspect 1.3
      property color backgroundColor 1.3
      property BackgroundMode backgroundMode 1.3
@@ -1700,58 +1583,180 @@
      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
++Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuToolkit.UCUbuntuShape
++    property color overlayColor
++    property QRectF overlayRect
++Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
++    function var findChild(var obj, var objectName)
++    function var findInvisibleChild(var obj, var objectName)
++    function var findChildWithProperty(var item, var property, var value)
++    function var centerOf(var item)
++    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
++    function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
++    function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
++    function var tryCompareFunction(var func, var expectedResult, var timeout)
++    function var typeString(var string)
++    function var warningFormat(var line, var column, var message)
++    function var waitForHeaderAnimation(var mainView)
++    readonly property QuickTestUtil testUtil
++Ubuntu.Test.UbuntuTestCase 1.3 UbuntuTestCase13: TestCase
++    function var findChild(var obj, var objectName)
++    function var findInvisibleChild(var obj, var objectName)
++    function var findChildWithProperty(var item, var property, var value)
++    function var centerOf(var item)
++    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
++    function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
++    function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
++    function var tryCompareFunction(var func, var expectedResult, var timeout)
++    function var typeString(var string)
++    function var warningFormat(var line, var column, var message)
++    function var waitForHeaderAnimation(var mainView)
++    readonly property QuickTestUtil testUtil
++Ubuntu.Components.UbuntuToolkit.LiveTimer: Enum
++    Disabled
++    Hour
++    Minute
++    Relative
++    Second
++Ubuntu.Components.UbuntuToolkit.UCAction: Enum
++    Bool
++    Integer
++    None
++    Object
++    Real
++    String
++UbuntuToolkit.UCActionContextAttached: QtObject
++Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
++    Fail
++    InProgress
++    Ready
++Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
++    Canceling
++    NoOperation
++    Reseting
++    Saving
++Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
++    AdaptationError
++    EarlyDate
++    InvalidDate
++    InvalidEvent
++    NoDaysOfWeek
++    NoError
++    OneTimeOnMoreDays
++    OperationPending
++Ubuntu.Components.UbuntuToolkit.UCAlarm: Flag
++    AutoDetect
++    Daily
++    Friday
++    Monday
++    Saturday
++    Sunday
++    Thursday
++    Tuesday
++    Wednesday
++Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
++    AutoDetect
++    Daily
++    Friday
++    Monday
++    Saturday
++    Sunday
++    Thursday
++    Tuesday
++    Wednesday
++Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
++    OneTime
++    Repeating
++Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
++    Committed
++    Hidden
++    Revealed
++Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
++    Downwards
++    Undefined
++    Upwards
++Ubuntu.Components.UbuntuToolkit.UCBottomEdgeHint: Enum
++    Active
++    Hidden
++    Inactive
++    Locked
++Ubuntu.Components.UbuntuToolkit.UCDragEvent: Enum
++    Dropped
++    Moving
++    Started
++Ubuntu.Components.UbuntuToolkit.UCLabel: Enum
++    Large
++    Medium
++    Small
++    XLarge
++    XSmall
++    XxSmall
++UbuntuToolkit.UCListItemDivider: Item
++    property color colorFrom
++    property color colorTo
++UbuntuToolkit.UCListItemExpansion: QtObject
++    property bool expanded
++    property double height
++UbuntuToolkit.UCMargins: QtObject
++    property double all
++    property double bottom
++    property double left
++    property double right
++    property double top
++Ubuntu.Components.UbuntuToolkit.UCMouse: Enum
++    AfterItem
++    BeforeItem
++Ubuntu.Components.UbuntuToolkit.UCNamespace: Enum
++    SummaryCaptionStyle
++    TitleCaptionStyle
++Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
++    Active
++    ConnectionError
++    Inactive
++    Synchronizing
++Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
++    Session
++    System
++    Undefined
++Ubuntu.Components.UbuntuToolkit.UCSlotsLayout: Enum
++    First
++    Last
++    Leading
++    Trailing
++UbuntuToolkit.UCStateSaverAttached: QtObject
++    property bool enabled
++    property string properties
++Ubuntu.Components.UbuntuToolkit.UCSwipeEvent: Enum
++    Finished
++    Started
++    Updated
++Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
++    Repeat
++    Transparent
++Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
++    AlignBottom
++    AlignTop
++    AlignVCenter
++Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
++    AlignHCenter
++    AlignLeft
++    AlignRight
++Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: 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
--Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
--    function var findChild(var obj, var objectName)
--    function var findInvisibleChild(var obj, var objectName)
--    function var findChildWithProperty(var item, var property, var value)
--    function var centerOf(var item)
--    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
--    function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
--    function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
--    function var tryCompareFunction(var func, var expectedResult, var timeout)
--    function var typeString(var string)
--    function var warningFormat(var line, var column, var message)
--    function var waitForHeaderAnimation(var mainView)
--    readonly property QuickTestUtil testUtil
--Ubuntu.Test.UbuntuTestCase 1.3 UbuntuTestCase13: TestCase
--    function var findChild(var obj, var objectName)
--    function var findInvisibleChild(var obj, var objectName)
--    function var findChildWithProperty(var item, var property, var value)
--    function var centerOf(var item)
--    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
--    function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
--    function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
--    function var tryCompareFunction(var func, var expectedResult, var timeout)
--    function var typeString(var string)
--    function var warningFormat(var line, var column, var message)
--    function var waitForHeaderAnimation(var mainView)
--    readonly property QuickTestUtil testUtil
++Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
++    SolidColor
++    VerticalGradient
++Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
++    DropShadow
++    Flat
++    Inset
++Ubuntu.Components.UbuntuToolkit.UCViewItemsAttached: Enum
++    CollapseOnOutsidePress
++    Exclusive
++    UnlockExpanded
  Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
      signal opened(QStringList uris)
  Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
@@ -1775,14 +1780,10 @@
      property list<int> expandedIndices
      property int expansionFlags
      signal selectedIndicesChanged(list<int> indices)
--    signal dragUpdated(ListItemDrag event)
++    signal dragUpdated(UCDragEvent event)
      signal expandedIndicesChanged(list<int> indices)
      property bool selectMode
      property list<int> selectedIndices
--Ubuntu.Components.ViewItems.ExpansionFlag: Enum
--    CollapseOnOutsidePress
--    Exclusive
--    UnlockExpanded
  Ubuntu.Components.i18n 1.0 0.1: QtObject
      property string domain
      property string language
 === modified file 'debian/libubuntugestures5-dev.install'
 --- debian/libubuntugestures5-dev.install	2016-03-04 11:58:12 +0000
 +++ debian/libubuntugestures5-dev.install	2016-06-22 15:52:01 +0000
@@ -1,20 +1,11 @@
--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
@@ -25,6 +16,7 @@
  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
 === modified file 'debian/libubuntutoolkit5-dev.install'
 --- debian/libubuntutoolkit5-dev.install	2016-06-02 12:50:02 +0000
 +++ debian/libubuntutoolkit5-dev.install	2016-06-22 15:52:01 +0000
@@ -1,18 +1,82 @@
--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/QQuickClipboard
  usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
  usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
++usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitModule
  usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
++usr/include/*/qt5/UbuntuToolkit/appheaderbase.h
  usr/include/*/qt5/UbuntuToolkit/asyncloader.h
  usr/include/*/qt5/UbuntuToolkit/colorutils.h
++usr/include/*/qt5/UbuntuToolkit/filterbehavior.h
++usr/include/*/qt5/UbuntuToolkit/frame.h
++usr/include/*/qt5/UbuntuToolkit/i18n.h
++usr/include/*/qt5/UbuntuToolkit/inversemouseareatype.h
++usr/include/*/qt5/UbuntuToolkit/listener.h
++usr/include/*/qt5/UbuntuToolkit/listitemdragarea.h
++usr/include/*/qt5/UbuntuToolkit/listitemdraghandler.h
++usr/include/*/qt5/UbuntuToolkit/listitemselection.h
++usr/include/*/qt5/UbuntuToolkit/listviewextensions.h
++usr/include/*/qt5/UbuntuToolkit/livetimer.h
  usr/include/*/qt5/UbuntuToolkit/mousetouchadaptor.h
  usr/include/*/qt5/UbuntuToolkit/propertychange.h
++usr/include/*/qt5/UbuntuToolkit/qquickclipboard.h
++usr/include/*/qt5/UbuntuToolkit/qquickmimedata.h
++usr/include/*/qt5/UbuntuToolkit/quickutils.h
++usr/include/*/qt5/UbuntuToolkit/sortbehavior.h
++usr/include/*/qt5/UbuntuToolkit/sortfiltermodel.h
++usr/include/*/qt5/UbuntuToolkit/textures.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/include/*/qt5/UbuntuToolkit/ucabstractbutton.h
++usr/include/*/qt5/UbuntuToolkit/ucaction.h
++usr/include/*/qt5/UbuntuToolkit/ucactioncontext.h
++usr/include/*/qt5/UbuntuToolkit/ucactionitem.h
++usr/include/*/qt5/UbuntuToolkit/ucactionmanager.h
++usr/include/*/qt5/UbuntuToolkit/ucalarm.h
++usr/include/*/qt5/UbuntuToolkit/ucalarmmodel.h
++usr/include/*/qt5/UbuntuToolkit/ucapplication.h
++usr/include/*/qt5/UbuntuToolkit/ucargument.h
++usr/include/*/qt5/UbuntuToolkit/ucarguments.h
++usr/include/*/qt5/UbuntuToolkit/ucbottomedge.h
++usr/include/*/qt5/UbuntuToolkit/ucbottomedgehint.h
++usr/include/*/qt5/UbuntuToolkit/ucbottomedgeregion.h
++usr/include/*/qt5/UbuntuToolkit/ucbottomedgestyle.h
++usr/include/*/qt5/UbuntuToolkit/ucdefaulttheme.h
++usr/include/*/qt5/UbuntuToolkit/ucdeprecatedtheme.h
++usr/include/*/qt5/UbuntuToolkit/ucfontutils.h
++usr/include/*/qt5/UbuntuToolkit/uchaptics.h
++usr/include/*/qt5/UbuntuToolkit/ucheader.h
++usr/include/*/qt5/UbuntuToolkit/ucinversemouse.h
++usr/include/*/qt5/UbuntuToolkit/uclabel.h
++usr/include/*/qt5/UbuntuToolkit/uclistitem.h
++usr/include/*/qt5/UbuntuToolkit/uclistitemactions.h
++usr/include/*/qt5/UbuntuToolkit/uclistitemlayout.h
++usr/include/*/qt5/UbuntuToolkit/uclistitemstyle.h
++usr/include/*/qt5/UbuntuToolkit/ucmainviewbase.h
++usr/include/*/qt5/UbuntuToolkit/ucmargins.h
++usr/include/*/qt5/UbuntuToolkit/ucmathutils.h
++usr/include/*/qt5/UbuntuToolkit/ucmouse.h
++usr/include/*/qt5/UbuntuToolkit/ucpagetreenode.h
++usr/include/*/qt5/UbuntuToolkit/ucpagewrapper.h
++usr/include/*/qt5/UbuntuToolkit/ucperformancemonitor.h
++usr/include/*/qt5/UbuntuToolkit/ucproportionalshape.h
++usr/include/*/qt5/UbuntuToolkit/ucqquickimageextension.h
++usr/include/*/qt5/UbuntuToolkit/ucscalingimageprovider.h
++usr/include/*/qt5/UbuntuToolkit/ucserviceproperties.h
++usr/include/*/qt5/UbuntuToolkit/ucslotslayout.h
++usr/include/*/qt5/UbuntuToolkit/ucstatesaver.h
++usr/include/*/qt5/UbuntuToolkit/ucstyleditembase.h
++usr/include/*/qt5/UbuntuToolkit/ucstylehints.h
++usr/include/*/qt5/UbuntuToolkit/uctheme.h
++usr/include/*/qt5/UbuntuToolkit/ucthemingextension.h
++usr/include/*/qt5/UbuntuToolkit/ucubuntuanimation.h
++usr/include/*/qt5/UbuntuToolkit/ucubuntushape.h
++usr/include/*/qt5/UbuntuToolkit/ucubuntushapeoverlay.h
++usr/include/*/qt5/UbuntuToolkit/ucubuntushapetextures.h
++usr/include/*/qt5/UbuntuToolkit/ucunits.h
++usr/include/*/qt5/UbuntuToolkit/ucurihandler.h
++usr/include/*/qt5/UbuntuToolkit/unitythemeiconprovider.h
  usr/lib/*/libUbuntuToolkit.la
  usr/lib/*/libUbuntuToolkit.prl
  usr/lib/*/libUbuntuToolkit.so
 === modified file 'documentation/overview.qdoc'
 --- documentation/overview.qdoc	2015-10-21 10:19:31 +0000
 +++ documentation/overview.qdoc	2016-06-22 15:52:01 +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-06-22 15:52:01 +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 'features/ubuntu_qml_plugin.prf'
 --- features/ubuntu_qml_plugin.prf	2016-04-05 06:28:06 +0000
 +++ features/ubuntu_qml_plugin.prf	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -20,3 +20,4 @@
  #do not warn for deprecated declarations
  QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
++DEFINES -= QT_DEPRECATED_WARNINGS
 === 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-06-22 15:52:01 +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<UbuntuToolkit::UCNamespace>(uri, 1, 2, "Ubuntu");
++    qmlRegisterSimpleSingletonType<UbuntuToolkit::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-06-22 15:52:01 +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-16 09:50:36 +0000
 +++ src/Ubuntu/Components/plugin/plugin.pri	2016-06-22 15:52:01 +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,202 +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/ucubuntushapetextures.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/ucubuntushapetextures.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-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -19,12 +19,10 @@
  #define UCNAMESPACE_H
  #include <QtCore/QObject>
--#include "quickutils.h"
++#include <quickutils.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/Test/plugin/testplugin.cpp'
 --- src/Ubuntu/Test/plugin/testplugin.cpp	2016-04-04 10:16:08 +0000
 +++ src/Ubuntu/Test/plugin/testplugin.cpp	2016-06-22 15:52:01 +0000
@@ -17,7 +17,9 @@
  #include "testplugin.h"
  #include <QtQml>
  #include "uctestextras.h"
--#include <MouseTouchAdaptor>
++#include <mousetouchadaptor.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-06-22 15:52:01 +0000
@@ -23,7 +23,9 @@
  #include <qpa/qwindowsysteminterface.h>
  #include <private/qobject_p.h>
  #include <QSysInfo>
--#include <MouseTouchAdaptor>
++#include <mousetouchadaptor.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-06-22 15:52:01 +0000
@@ -24,6 +24,7 @@
             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-06-22 15:52:01 +0000
@@ -16,7 +16,7 @@
  #include "candidateinactivitytimer.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
 === modified file 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h'
 --- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h	2015-11-09 08:38:28 +0000
 +++ src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h	2016-06-22 15:52:01 +0000
@@ -23,7 +23,7 @@
  #include "timer.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/timer.cpp'
 --- src/Ubuntu/UbuntuGestures/timer.cpp	2016-06-02 08:22:41 +0000
 +++ src/Ubuntu/UbuntuGestures/timer.cpp	2016-06-22 15:52:01 +0000
@@ -16,7 +16,7 @@
  #include "timer.h"
--namespace UbuntuGestures {
++UG_NAMESPACE_BEGIN
  Timer::Timer(QObject *parent) : AbstractTimer(parent)
+ {
@@ -150,4 +150,4 @@
      return fakeTimer;
+ }
--} // namespace UbuntuGestures
++UG_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuGestures/timer.h'
 --- src/Ubuntu/UbuntuGestures/timer.h	2015-11-17 12:02:40 +0000
 +++ src/Ubuntu/UbuntuGestures/timer.h	2016-06-22 15:52:01 +0000
@@ -24,7 +24,7 @@
  #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-06-22 15:52:01 +0000
@@ -20,14 +20,12 @@
  #include <QElapsedTimer>
--namespace UbuntuGestures {
++UG_NAMESPACE_BEGIN
++
  class RealTimeSourcePrivate {
  public:
      QElapsedTimer timer;
  };
--}
--
--using namespace UbuntuGestures;
  RealTimeSource::RealTimeSource()
      : UbuntuGestures::TimeSource()
@@ -45,3 +43,5 @@
+ {
      return d->timer.elapsed();
+ }
++
++UG_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuGestures/timesource.h'
 --- src/Ubuntu/UbuntuGestures/timesource.h	2015-11-09 08:31:43 +0000
 +++ src/Ubuntu/UbuntuGestures/timesource.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -16,6 +16,8 @@
  #include "touchownershipevent.h"
++UG_NAMESPACE_BEGIN
++
  QEvent::Type TouchOwnershipEvent::m_touchOwnershipType = (QEvent::Type)-1;
  TouchOwnershipEvent::TouchOwnershipEvent(int touchId, bool gained)
@@ -33,3 +35,5 @@
      return m_touchOwnershipType;
+ }
++
++UG_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuGestures/touchownershipevent.h'
 --- src/Ubuntu/UbuntuGestures/touchownershipevent.h	2015-11-09 08:31:43 +0000
 +++ src/Ubuntu/UbuntuGestures/touchownershipevent.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -31,7 +31,7 @@
  #include "debughelpers.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
 === modified file 'src/Ubuntu/UbuntuGestures/touchregistry.h'
 --- src/Ubuntu/UbuntuGestures/touchregistry.h	2016-06-02 08:22:41 +0000
 +++ src/Ubuntu/UbuntuGestures/touchregistry.h	2016-06-22 15:52:01 +0000
@@ -31,9 +31,7 @@
  // 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-06-22 15:52:01 +0000
@@ -21,3 +21,27 @@
  #else
  #  define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
  #endif
++
++#if defined(UBUNTUGESTURES_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-06-22 15:52:01 +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 <zsombor.egri@canonical.com>
++ */
++
++#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-06-22 15:52:01 +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 <zsombor.egri@canonical.com>
++ */
++
++#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-06-22 15:52:01 +0000
@@ -29,7 +29,7 @@
  #include <UbuntuGestures/TouchRegistry>
  #include <UbuntuGestures/UnownedTouchEvent>
--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)
@@ -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-06-22 15:52:01 +0000
@@ -28,11 +28,11 @@
  // 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-06-22 15:52:01 +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) {}
@@ -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-06-22 15:52:01 +0000
@@ -16,6 +16,8 @@
  #include "unownedtouchevent.h"
++UG_NAMESPACE_BEGIN
++
  QEvent::Type UnownedTouchEvent::m_unownedTouchEventType = (QEvent::Type)-1;
  UnownedTouchEvent::UnownedTouchEvent(QTouchEvent *touchEvent)
@@ -37,3 +39,5 @@
+ {
      return m_touchEvent.data();
+ }
++
++UG_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuGestures/unownedtouchevent.h'
 --- src/Ubuntu/UbuntuGestures/unownedtouchevent.h	2015-11-09 08:31:43 +0000
 +++ src/Ubuntu/UbuntuGestures/unownedtouchevent.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +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,11 +24,18 @@
  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 += \
++QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
++DEFINES -= QT_DEPRECATED_WARNINGS
++DEFINES -= QT_ASCII_CAST_WARNINGS
++
++HEADERS += \
      colorutils.h \
      ubuntutoolkitglobal.h \
      tree.h \
@@ -27,11 +43,202 @@
      asyncloader_p.h \
      mousetouchadaptor.h \
      mousetouchadaptor_p.h \
--    propertychange.h
++    propertychange.h \
++    ubuntutoolkitmodule.h
  SOURCES += \
      colorutils.cpp \
      tree.cpp \
      asyncloader.cpp \
      mousetouchadaptor.cpp \
--    propertychange.cpp
++    propertychange.cpp \
++    ubuntutoolkitmodule.cpp
++
++HEADERS += \
++    uctheme.h \
++    i18n.h \
++    listener.h \
++    ucscalingimageprovider.h \
++    ucunits.h \
++    ucqquickimageextension.h \
++    quickutils.h \
++    ucubuntushapetextures.h \
++    ucubuntushape.h \
++    ucubuntushapeoverlay.h \
++    ucproportionalshape.h \
++    inversemouseareatype.h \
++    qquickclipboard.h \
++    qquickmimedata.h \
++    qquickclipboard_p.h \
++    ucubuntuanimation.h \
++    ucfontutils.h \
++    ucapplication.h \
++    ucarguments.h \
++    ucargument.h \
++    ucalarm.h \
++    ucalarm_p.h \
++    alarmmanager_p_p.h \
++    alarmmanager_p.h \
++    ucalarmmodel.h \
++    unitythemeiconprovider.h \
++    adapters/alarmsadapter_p.h \
++    ucstatesaver.h \
++    sortbehavior.h \
++    filterbehavior.h \
++    sortfiltermodel.h \
++    statesaverbackend_p.h \
++    ucstatesaver_p.h \
++    ucurihandler.h \
++    ucinversemouse.h \
++    ucmouse.h \
++    unixsignalhandler_p.h \
++    ucstyleditembase.h \
++    ucstyleditembase_p.h \
++    ucaction.h \
++    ucactioncontext.h \
++    ucactionmanager.h \
++    adapters/actionsproxy_p.h \
++    adapters/dbuspropertywatcher_p.h \
++    uclistitem.h \
++    uclistitem_p.h \
++    uclistitemactions.h \
++    uclistitemactions_p.h \
++    uclistitemstyle.h \
++    ucserviceproperties.h \
++    ucserviceproperties_p.h \
++    privates/listitemdragarea.h \
++    privates/listitemdraghandler.h \
++    privates/listitemselection.h \
++    ucdeprecatedtheme.h \
++    ucdefaulttheme.h \
++    ucstylehints.h \
++    ucslotslayout.h \
++    ucslotslayout_p.h \
++    livetimer.h \
++    livetimer_p.h \
++    timeutils_p.h \
++    ucactionitem.h \
++    ucactionitem_p.h \
++    uchaptics.h \
++    ucabstractbutton.h \
++    ucabstractbutton_p.h \
++    ucmargins.h \
++    ucthemingextension.h \
++    ucheader.h \
++    uclabel.h \
++    uclistitemlayout.h \
++    privates/threelabelsslot_p.h \
++    ucimportversionchecker_p.h \
++    ucbottomedgehint.h \
++    ucbottomedgehint_p.h \
++    ucmathutils.h \
++    ucbottomedge.h \
++    ucbottomedge_p.h \
++    ucbottomedgestyle.h \
++    ucbottomedgeregion.h \
++    ucpagetreenode.h \
++    ucpagetreenode_p.h \
++    ucmainviewbase.h \
++    ucmainviewbase_p.h \
++    ucperformancemonitor.h \
++    privates/listviewextensions.h \
++    privates/frame.h \
++    privates/ucpagewrapper.h \
++    privates/ucpagewrapper_p.h \
++    privates/ucpagewrapperincubator_p.h \
++    privates/appheaderbase.h \
++    label_p.h \
++    ucbottomedgeregion_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-06-22 15:52:01 +0000
@@ -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-06-22 15:52:01 +0000
@@ -22,6 +22,8 @@
  #include <QtCore/QPointer>
  #include "ucaction.h"
++UT_NAMESPACE_BEGIN
++
  class UCActionContext;
  class UCPopupContext;
  class ActionProxy
@@ -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-06-22 15:52:01 +0000
@@ -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-06-22 15:52:01 +0000
@@ -19,19 +19,22 @@
  #ifndef ALARMSADAPTER_P_H
  #define ALARMSADAPTER_P_H
--#include "alarmmanager_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 +209,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-06-22 15:52:01 +0000
@@ -23,6 +23,8 @@
  #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-06-22 15:52:01 +0000
@@ -25,6 +25,9 @@
  #include "ucserviceproperties_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-06-22 15:52:01 +0000
@@ -21,6 +21,8 @@
  #include "ucalarm.h"
  #include "ucalarm_p.h"
++UT_NAMESPACE_BEGIN
++
  AlarmManagerPrivate::AlarmManagerPrivate(AlarmManager *qq)
      : q_ptr(qq)
      , completed(false)
@@ -88,4 +90,6 @@
      return AlarmManagerPrivate::get()->createAlarmData(alarm);
+ }
++UT_NAMESPACE_END
++
  #include "moc_alarmmanager_p.cpp"
 === 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-06-22 15:52:01 +0000
@@ -25,6 +25,8 @@
  #include "ucalarm.h"
++UT_NAMESPACE_BEGIN
++
  class AlarmUtils {
  public:
      static QHash<int, QByteArray> roles() {
@@ -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-06-22 15:52:01 +0000
@@ -24,7 +24,9 @@
  #include "alarmmanager_p.h"
  #include <QtCore/QUrl>
--class AlarmManagerPrivate
++UT_NAMESPACE_BEGIN
++
++class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate
+ {
      Q_DECLARE_PUBLIC(AlarmManager)
  public:
@@ -58,4 +60,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-06-22 15:52:01 +0000
@@ -22,7 +22,7 @@
  #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
 === modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.h'
 --- src/Ubuntu/UbuntuToolkit/asyncloader.h	2016-04-01 05:30:24 +0000
 +++ src/Ubuntu/UbuntuToolkit/asyncloader.h	2016-06-22 15:52:01 +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
 === modified file 'src/Ubuntu/UbuntuToolkit/asyncloader_p.h'
 --- src/Ubuntu/UbuntuToolkit/asyncloader_p.h	2016-02-25 14:30:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/asyncloader_p.h	2016-06-22 15:52:01 +0000
@@ -21,9 +21,10 @@
  #include <QtCore/private/qobject_p.h>
  #include <QtQml/QQmlIncubator>
--#include <AsyncLoader>
++#include <ubuntutoolkitglobal.h>
++#include <asyncloader.h>
--namespace UbuntuToolkit {
++UT_NAMESPACE_BEGIN
  class AsyncLoaderPrivate : public QObjectPrivate, public QQmlIncubator
+ {
@@ -48,7 +49,7 @@
      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-06-22 15:52:01 +0000
@@ -17,7 +17,7 @@
  #include "colorutils.h"
  #include <QColor>
--namespace UbuntuToolkit {
++UT_NAMESPACE_BEGIN
  ColorUtils::ColorUtils(QObject *parent) : QObject(parent)
  {}
@@ -27,4 +27,4 @@
      return color.lightnessF();
+ }
--}
++UT_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuToolkit/colorutils.h'
 --- src/Ubuntu/UbuntuToolkit/colorutils.h	2016-01-26 09:57:35 +0000
 +++ src/Ubuntu/UbuntuToolkit/colorutils.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -19,6 +19,8 @@
  #include "filterbehavior.h"
++UT_NAMESPACE_BEGIN
++
  FilterBehavior::FilterBehavior(QObject *parent)
      : QObject(parent)
      , m_property(QString())
@@ -53,3 +55,4 @@
      Q_EMIT patternChanged();
+ }
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/filterbehavior.h' => 'src/Ubuntu/UbuntuToolkit/filterbehavior.h'
 --- src/Ubuntu/Components/plugin/filterbehavior.h	2014-06-04 16:59:07 +0000
 +++ src/Ubuntu/UbuntuToolkit/filterbehavior.h	2016-06-22 15:52:01 +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-06-20 14:31:12 +0000
 +++ src/Ubuntu/UbuntuToolkit/i18n.cpp	2016-06-22 15:52:01 +0000
@@ -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.
@@ -341,3 +341,5 @@
+     }
      return datetime.toString(Qt::DefaultLocaleShortDate);
+ }
++
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/i18n.h' => 'src/Ubuntu/UbuntuToolkit/i18n.h'
 --- src/Ubuntu/Components/plugin/i18n.h	2016-02-10 09:54:59 +0000
 +++ src/Ubuntu/UbuntuToolkit/i18n.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -18,9 +18,10 @@
  #include <QtGui/QGuiApplication>
  #include "quickutils.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.h'
 --- src/Ubuntu/Components/plugin/inversemouseareatype.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/inversemouseareatype.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -19,6 +19,8 @@
  #include "uclabel.h"
++UT_NAMESPACE_BEGIN
++
  class UCLabelPrivate
+ {
      Q_DECLARE_PUBLIC(UCLabel)
@@ -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-06-22 15:52:01 +0000
@@ -18,6 +18,8 @@
  #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.h'
 --- src/Ubuntu/Components/plugin/listener.h	2015-02-12 07:31:08 +0000
 +++ src/Ubuntu/UbuntuToolkit/listener.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -17,8 +17,9 @@
  #include "livetimer.h"
  #include "livetimer_p.h"
++UT_NAMESPACE_BEGIN
++
  /*! \qmltype LiveTimer
--    \instantiates LiveTimer
      \inqmlmodule Ubuntu.Components
      \ingroup ubuntu
      \since Ubuntu.Components 1.3
@@ -140,3 +141,5 @@
+ {
      m_effectiveFrequency = frequency;
+ }
++
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/livetimer.h' => 'src/Ubuntu/UbuntuToolkit/livetimer.h'
 --- src/Ubuntu/Components/plugin/livetimer.h	2015-08-12 09:56:12 +0000
 +++ src/Ubuntu/UbuntuToolkit/livetimer.h	2016-06-22 15:52:01 +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.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-06-22 15:52:01 +0000
@@ -19,6 +19,8 @@
  #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_p.h' => 'src/Ubuntu/UbuntuToolkit/livetimer_p.h'
 --- src/Ubuntu/Components/plugin/livetimer_p.h	2015-07-20 15:34:32 +0000
 +++ src/Ubuntu/UbuntuToolkit/livetimer_p.h	2016-06-22 15:52:01 +0000
@@ -21,6 +21,8 @@
  #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-06-22 15:52:01 +0000
@@ -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"
 === modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h'
 --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h	2016-04-04 10:16:08 +0000
 +++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h	2016-06-22 15:52:01 +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
 === modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
 --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-05-13 08:39:18 +0000
 +++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-06-22 15:52:01 +0000
@@ -25,7 +25,7 @@
  #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-06-22 15:52:01 +0000
@@ -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-06-22 15:52:01 +0000
@@ -17,6 +17,8 @@
  #include "appheaderbase.h"
  #include "ucstyleditembase_p.h"
++UT_NAMESPACE_BEGIN
++
  /*!
      \qmltype AppHeaderBase
      \instantiates UCAppHeaderBase
@@ -67,3 +69,5 @@
          Q_EMIT animateChanged();
+     }
+ }
++
++UT_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/appheaderbase.h'
 --- src/Ubuntu/Components/plugin/privates/appheaderbase.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/appheaderbase.h	2016-06-22 15:52:01 +0000
@@ -18,19 +18,28 @@
  #define APPHEADERBASE_H
  #include "ucheader.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-06-22 15:52:01 +0000
@@ -21,6 +21,8 @@
  #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
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/frame.h'
 --- src/Ubuntu/Components/plugin/privates/frame.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/frame.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -31,6 +31,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 +312,5 @@
          UCListItemPrivate::get(item)->dragHandler->update(targetItem);
+     }
+ }
++
++UT_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.h'
 --- src/Ubuntu/Components/plugin/privates/listitemdragarea.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.h	2016-06-22 15:52:01 +0000
@@ -22,6 +22,9 @@
  #include <QtCore/QPointer>
  class QQuickFlickable;
++
++UT_NAMESPACE_BEGIN
++
  class ListItemDragArea : public QQuickItem
+ {
      Q_OBJECT
@@ -52,4 +55,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-06-22 15:52:01 +0000
@@ -17,9 +17,10 @@
  #include "listitemdraghandler.h"
  #include "uclistitem.h"
  #include "uclistitem_p.h"
++#include <propertychange.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
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.h'
 --- src/Ubuntu/Components/plugin/privates/listitemdraghandler.h	2016-06-02 12:50:02 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -17,6 +17,8 @@
  #include "uclistitem.h"
  #include "uclistitem_p.h"
++UT_NAMESPACE_BEGIN
++
  UCListItemExpansion::UCListItemExpansion(QObject *parent)
      : QObject(parent)
      , m_listItem(static_cast<UCListItem*>(parent))
@@ -104,3 +106,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-06-22 15:52:01 +0000
@@ -17,6 +17,8 @@
  #include "listitemselection.h"
  #include "uclistitem_p.h"
++UT_NAMESPACE_BEGIN
++
  ListItemSelection::ListItemSelection(UCListItem *parent)
      : QObject(parent)
      , hostItem(parent)
@@ -139,3 +141,5 @@
          Q_EMIT hostItem->selectedChanged();
+     }
+ }
++
++UT_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemselection.h'
 --- src/Ubuntu/Components/plugin/privates/listitemselection.h	2015-11-16 16:24:42 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/listitemselection.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -22,6 +22,8 @@
  #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
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/listviewextensions.h'
 --- src/Ubuntu/Components/plugin/privates/listviewextensions.h	2016-01-15 06:33:03 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/listviewextensions.h	2016-06-22 15:52:01 +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
 === 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-06-22 15:52:01 +0000
@@ -20,6 +20,8 @@
  #include "ucfontutils.h"
  #include "uctheme.h"
++UT_NAMESPACE_BEGIN
++
  UCThreeLabelsSlotPrivate::UCThreeLabelsSlotPrivate()
      : QQuickItemPrivate()
      , m_title(Q_NULLPTR)
@@ -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-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -21,6 +21,8 @@
  #include <QQmlEngine>
  #include <QQmlContext>
++UT_NAMESPACE_BEGIN
++
  UCPageWrapperPrivate::UCPageWrapperPrivate() :
      m_object(nullptr),
      m_parentPage(nullptr),
@@ -770,4 +772,6 @@
    Signal emitted when incubator completes page loading.
   */
++UT_NAMESPACE_END
++
  #include "moc_ucpagewrapper.cpp"
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.h'
 --- src/Ubuntu/Components/plugin/privates/ucpagewrapper.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.h	2016-06-22 15:52:01 +0000
@@ -19,8 +19,10 @@
  #include "ucpagetreenode.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 +112,6 @@
      Q_PRIVATE_SLOT(d_func(), void onActiveChanged())
  };
++UT_NAMESPACE_END
++
  #endif // UCPAGEWRAPPER_H
 === modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h'
 --- src/Ubuntu/Components/plugin/privates/ucpagewrapper_p.h	2016-02-18 19:18:13 +0000
 +++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h	2016-06-22 15:52:01 +0000
@@ -19,6 +19,8 @@
  #include "ucpagetreenode_p.h"
++UT_NAMESPACE_BEGIN
++
  class UCPageWrapper;
  class UCPageWrapperIncubator;
  class UCPageWrapperPrivate : public UCPageTreeNodePrivate
@@ -74,4 +76,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-06-22 15:52:01 +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-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -21,7 +21,7 @@
  #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
 === modified file 'src/Ubuntu/UbuntuToolkit/propertychange.h'
 --- src/Ubuntu/UbuntuToolkit/propertychange.h	2016-06-02 12:50:02 +0000
 +++ src/Ubuntu/UbuntuToolkit/propertychange.h	2016-06-22 15:52:01 +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-06-22 15:52:01 +0000
@@ -23,6 +23,8 @@
  #include "qquickclipboard_p.h"
  #include "qquickmimedata.h"
++UT_NAMESPACE_BEGIN
++
  /*!
   * \qmltype Clipboard
   * \instantiates QQuickClipboard
@@ -196,4 +198,6 @@
      d->clipboard->clear(d->mode);
+ }
++UT_NAMESPACE_END
++
  #include "moc_qquickclipboard.cpp"
 === renamed file 'src/Ubuntu/Components/plugin/qquickclipboard.h' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard.h'
 --- src/Ubuntu/Components/plugin/qquickclipboard.h	2013-01-27 12:47:00 +0000
 +++ src/Ubuntu/UbuntuToolkit/qquickclipboard.h	2016-06-22 15:52:01 +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();
@@ -51,4 +59,6 @@
      QScopedPointer<QQuickClipboardPrivate> d_ptr;
  };
++UT_NAMESPACE_END
++
  #endif // QQUICKCLIPBOARD_H
 === renamed file 'src/Ubuntu/Components/plugin/qquickclipboard_p.h' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h'
 --- src/Ubuntu/Components/plugin/qquickclipboard_p.h	2013-01-25 15:45:15 +0000
 +++ src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h	2016-06-22 15:52:01 +0000
@@ -22,6 +22,8 @@
  #include "qquickclipboard.h"
  #include <QtGui/QClipboard>
++UT_NAMESPACE_BEGIN
++
  class QQuickMimeData;
  class QQuickClipboardPrivate {
      Q_DECLARE_PUBLIC(QQuickClipboard)
@@ -36,4 +38,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-06-22 15:52:01 +0000
@@ -25,9 +25,10 @@
  #include <QDebug>
++UT_NAMESPACE_BEGIN
++
  /*!
   * \qmltype MimeData
-- * \instantiates QQuickMimeData
   * \inqmlmodule Ubuntu.Components
   * \ingroup ubuntu
   * \brief MimeData type provides interface to access and store data to the
@@ -267,3 +268,5 @@
      if (emitSignal)
          Q_EMIT dataChanged();
+ }
++
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/qquickmimedata.h' => 'src/Ubuntu/UbuntuToolkit/qquickmimedata.h'
 --- src/Ubuntu/Components/plugin/qquickmimedata.h	2013-01-25 15:45:15 +0000
 +++ src/Ubuntu/UbuntuToolkit/qquickmimedata.h	2016-06-22 15:52:01 +0000
@@ -25,7 +25,9 @@
  #include <QtCore/QUrl>
  #include "qquickclipboard.h"
--class QQuickMimeData : public QObject
++UT_NAMESPACE_BEGIN
++
++class UBUNTUTOOLKIT_EXPORT QQuickMimeData : public QObject
+ {
      Q_OBJECT
      Q_PROPERTY(QStringList formats READ formats NOTIFY formatsChanged)
@@ -70,4 +72,6 @@
      QMimeData *m_mimeData;
  };
++UT_NAMESPACE_END
++
  #endif // QQUICKMIMEDATA_H
 === renamed file 'src/Ubuntu/Components/plugin/quickutils.cpp' => 'src/Ubuntu/UbuntuToolkit/quickutils.cpp'
 --- src/Ubuntu/Components/plugin/quickutils.cpp	2016-02-24 06:45:27 +0000
 +++ src/Ubuntu/UbuntuToolkit/quickutils.cpp	2016-06-22 15:52:01 +0000
@@ -30,6 +30,8 @@
  #include <private/qquicktextinput_p.h>
  #include <private/qquicktextedit_p.h>
++UT_NAMESPACE_BEGIN
++
  QuickUtils *QuickUtils::m_instance = nullptr;
  QuickUtils::QuickUtils(QObject *parent) :
@@ -267,3 +269,5 @@
+     }
      return Q_NULLPTR;
+ }
++
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/quickutils.h' => 'src/Ubuntu/UbuntuToolkit/quickutils.h'
 --- src/Ubuntu/Components/plugin/quickutils.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/quickutils.h	2016-06-22 15:52:01 +0000
@@ -21,11 +21,15 @@
  #include <QtCore/QObject>
  #include <QtCore/QPointer>
  #include <QtQuick/QQuickView>
++#include <ubuntutoolkitglobal.h>
  class QQuickItem;
  class QQmlEngine;
  class QQmlComponent;
--class QuickUtils : public QObject
++
++UT_NAMESPACE_BEGIN
++
++class UBUNTUTOOLKIT_EXPORT QuickUtils : public QObject
+ {
      Q_OBJECT
      Q_PROPERTY(QQuickItem *rootObject READ rootObject NOTIFY rootObjectChanged)
@@ -91,5 +95,16 @@
      void lookupQuickView();
  };
++#define UC_QML_DEPRECATION_WARNING(msg) \
++    { \
++        static bool loggedOnce = false; \
++        if (!loggedOnce) { \
++            if (QuickUtils::showDeprecationWarnings()) { \
++                qmlInfo(this) << msg; \
++            } \
++        } \
++    }
++
++UT_NAMESPACE_END
  #endif // QUICKUTILS_P_H
 === renamed file 'src/Ubuntu/Components/plugin/plugin.qrc' => 'src/Ubuntu/UbuntuToolkit/resources.qrc'
 === renamed directory 'src/Ubuntu/Components/plugin/shaders' => 'src/Ubuntu/UbuntuToolkit/shaders'
 === renamed file 'src/Ubuntu/Components/plugin/sortbehavior.cpp' => 'src/Ubuntu/UbuntuToolkit/sortbehavior.cpp'
 --- src/Ubuntu/Components/plugin/sortbehavior.cpp	2014-06-04 16:59:07 +0000
 +++ src/Ubuntu/UbuntuToolkit/sortbehavior.cpp	2016-06-22 15:52:01 +0000
@@ -19,6 +19,8 @@
  #include "sortbehavior.h"
++UT_NAMESPACE_BEGIN
++
  SortBehavior::SortBehavior(QObject *parent)
      : QObject(parent)
      , m_property(QString())
@@ -53,3 +55,4 @@
      Q_EMIT orderChanged();
+ }
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/sortbehavior.h' => 'src/Ubuntu/UbuntuToolkit/sortbehavior.h'
 --- src/Ubuntu/Components/plugin/sortbehavior.h	2014-06-04 16:59:07 +0000
 +++ src/Ubuntu/UbuntuToolkit/sortbehavior.h	2016-06-22 15:52:01 +0000
@@ -21,8 +21,11 @@
  #define SORTBEHAVIOR_H
  #include <QSortFilterProxyModel>
--
--class SortBehavior : public QObject {
++#include <ubuntutoolkitglobal.h>
++
++UT_NAMESPACE_BEGIN
++
++class UBUNTUTOOLKIT_EXPORT SortBehavior : public QObject {
      Q_OBJECT
      Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
@@ -45,4 +48,6 @@
      Qt::SortOrder m_order;
  };
++UT_NAMESPACE_END
++
  #endif // SORTBEHAVIOR_H
 === renamed file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp' => 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp'
 --- src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2016-05-25 12:48:10 +0000
 +++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp	2016-06-22 15:52:01 +0000
@@ -20,9 +20,10 @@
  #include "sortfiltermodel.h"
++UT_NAMESPACE_BEGIN
++
  /*!
   * \qmltype SortFilterModel
-- * \instantiates QSortFilterProxyModelQML
   * \inqmlmodule Ubuntu.Components
   * \ingroup ubuntu
   * \brief SortFilterModel sorts and filters rows from an existing model.
@@ -256,5 +257,7 @@
      return result;
+ }
++UT_NAMESPACE_END
++
  #include "moc_sortfiltermodel.cpp"
 === renamed file 'src/Ubuntu/Components/plugin/sortfiltermodel.h' => 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.h'
 --- src/Ubuntu/Components/plugin/sortfiltermodel.h	2016-04-28 11:19:46 +0000
 +++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.h	2016-06-22 15:52:01 +0000
@@ -25,14 +25,16 @@
  #include "sortbehavior.h"
  #include "filterbehavior.h"
++UT_NAMESPACE_BEGIN
++
  class Q_DECL_EXPORT QSortFilterProxyModelQML : public QSortFilterProxyModel
+ {
      Q_OBJECT
      Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
      Q_PROPERTY(int count READ count NOTIFY countChanged)
--    Q_PROPERTY(SortBehavior* sort READ sortBehavior NOTIFY sortChanged)
--    Q_PROPERTY(FilterBehavior* filter READ filterBehavior NOTIFY filterChanged)
++    Q_PROPERTY(UT_PREPEND_NAMESPACE(SortBehavior)* sort READ sortBehavior NOTIFY sortChanged)
++    Q_PROPERTY(UT_PREPEND_NAMESPACE(FilterBehavior)* filter READ filterBehavior NOTIFY filterChanged)
  public:
      explicit QSortFilterProxyModelQML(QObject *parent = 0);
@@ -65,4 +67,6 @@
      int roleByName(const QString& roleName) const;
  };
++UT_NAMESPACE_END
++
  #endif // QSORTFILTERPROXYMODELQML_H
 === renamed file 'src/Ubuntu/Components/plugin/statesaverbackend_p.cpp' => 'src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp'
 --- src/Ubuntu/Components/plugin/statesaverbackend_p.cpp	2016-02-01 18:57:26 +0000
 +++ src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp	2016-06-22 15:52:01 +0000
@@ -31,6 +31,8 @@
  #include "unixsignalhandler_p.h"
++UT_NAMESPACE_BEGIN
++
  StateSaverBackend *StateSaverBackend::m_instance = nullptr;
  StateSaverBackend::StateSaverBackend(QObject *parent)
@@ -246,4 +248,4 @@
      return true;
+ }
--
++UT_NAMESPACE_END
 === renamed file 'src/Ubuntu/Components/plugin/statesaverbackend_p.h' => 'src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h'
 --- src/Ubuntu/Components/plugin/statesaverbackend_p.h	2016-02-01 13:38:29 +0000
 +++ src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h	2016-06-22 15:52:01 +0000
@@ -25,8 +25,11 @@
  #include <QtCore/QSet>
  #include <QtCore/QTimer>
  #include <QtCore/QStack>
--
--class StateSaverBackend : public QObject
++#include <ubuntutoolkitglobal.h>
++
++UT_NAMESPACE_BEGIN
++
++class UBUNTUTOOLKIT_EXPORT StateSaverBackend : public QObject
+ {
      Q_OBJECT
  public:
@@ -75,4 +78,6 @@
      static StateSaverBackend *m_instance;
  };
++UT_NAMESPACE_END
++
  #endif // STATESAVERBACKEND_P_H
 === renamed file 'src/Ubuntu/Components/plugin/timeutils_p.h' => 'src/Ubuntu/UbuntuToolkit/timeutils_p.h'
 --- src/Ubuntu/Components/plugin/timeutils_p.h	2015-07-20 15:52:11 +0000
 +++ src/Ubuntu/UbuntuToolkit/timeutils_p.h	2016-06-22 15:52:01 +0000
@@ -24,6 +24,8 @@
  #include <QObject>
  #include <QTimer>
++UT_NAMESPACE_BEGIN
++
  /* Check the system locale setting to see if the format is 24-hour
    time or 12-hour time */
  inline bool isLocale12h(void)
@@ -138,4 +140,6 @@
      return LiveTimer::Disabled;
+ }
++UT_NAMESPACE_END
++
  #endif // TIMEUTILS_P_H
 === modified file 'src/Ubuntu/UbuntuToolkit/tree.cpp'
 --- src/Ubuntu/UbuntuToolkit/tree.cpp	2016-02-22 08:49:31 +0000
 +++ src/Ubuntu/UbuntuToolkit/tree.cpp	2016-06-22 15:52:01 +0000
@@ -19,7 +19,7 @@
  #include <private/qobject_p.h>
  #include <QQmlEngine>
--namespace UbuntuToolkit {
++UT_NAMESPACE_BEGIN
  class TreePrivate : public QObjectPrivate
+ {
@@ -228,5 +228,4 @@
      return d->m_parents.at(i);
+ }
--}
--
++UT_NAMESPACE_END
 === modified file 'src/Ubuntu/UbuntuToolkit/tree.h'
 --- src/Ubuntu/UbuntuToolkit/tree.h	2016-02-22 11:06:53 +0000
 +++ src/Ubuntu/UbuntuToolkit/tree.h	2016-06-22 15:52:01 +0000
@@ -21,7 +21,7 @@
  #include <QVariant>
  #include "ubuntutoolkitglobal.h"
--namespace UbuntuToolkit {
++UT_NAMESPACE_BEGIN
  class TreePrivate;
  class UBUNTUTOOLKIT_EXPORT Tree : public QObject
@@ -43,6 +43,6 @@
      Q_DECLARE_PRIVATE(Tree)
  };
--}
++UT_NAMESPACE_END
  #endif // TREE_H
 === modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h'
 --- src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h	2016-01-22 09:31:54 +0000
 +++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h	2016-06-22 15:52:01 +0000
@@ -24,6 +24,34 @@
  #  define UBUNTUTOOLKIT_EXPORT Q_DECL_IMPORT
  #endif
++#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)
++
++#if defined(UBUNTUTOOLKIT_NAMESPACE)
++
++#define UT_NAMESPACE_BEGIN          namespace UbuntuToolkit {
++#define UT_NAMESPACE_END            }
++#define UT_PREPEND_NAMESPACE(name)  UbuntuToolkit::name
++#define UT_USE_NAMESPACE            using namespace UbuntuToolkit;
++#define UT_FORWARD_DECLARE_CLASS(name) \
++    UT_NAMESPACE_BEGIN class name; UT_NAMESPACE_END \
++    using UT_PREPEND_NAMESPACE(name);
++#define UT_FORWARD_DECLARE_STRUCT(name) \
++    UT_NAMESPACE_BEGIN struct name; UT_NAMESPACE_END \
++    using UT_PREPEND_NAMESPACE(name);
++
++#else // no namespace
++
++#define UT_NAMESPACE_BEGIN
++#define UT_NAMESPACE_END
++#define UT_PREPEND_NAMESPACE(name)  name
++#define UT_USE_NAMESPACE
++#define UT_FORWARD_DECLARE_CLASS(name) class name;
++#define UT_FORWARD_DECLARE_STRUCT(name) struct name;
++
++#endif
  #endif // UBUNTUTOOLKITGLOBAL_H
 === added file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp'
 --- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	1970-01-01 00:00:00 +0000
 +++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-06-22 15:52:01 +0000
@@ -0,0 +1,277 @@
++/*
++ * 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 <zsombor.egri@canonical.com>
++ */
++
++#include "ubuntutoolkitmodule.h"
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlContext>
++#include <QtQuick/private/qquickimagebase_p.h>
++#include <QDBusConnection>
++#include <QtGui/QGuiApplication>
++#include <QtGui/QScreen>
++
++#include <sys/types.h>
++#include <unistd.h>
++#include <stdexcept>
++
++#include <UbuntuToolkit>
++
++UT_NAMESPACE_BEGIN
++
++const char *EngineProperty("__ubuntu_toolkit_plugin_data");
++
++/******************************************************************************
++ * UbuntuToolkitModule
++ */
++UbuntuToolkitModule* UbuntuToolkitModule::create(QQmlEngine *engine, const QUrl &baseUrl)
++{
++    if (!engine) {
++        return Q_NULLPTR;
++    }
++    UbuntuToolkitModule *data = new UbuntuToolkitModule(engine);
++    data->m_baseUrl = QUrl(baseUrl.toString() + '/');
++    engine->setProperty(EngineProperty, QVariant::fromValue(data));
++    return data;
++}
++
++void UbuntuToolkitModule::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 UbuntuToolkitModule::setWindowContextProperty(QWindow* focusWindow)
++{
++    QQuickView* view = qobject_cast<QQuickView*>(focusWindow);
++
++    if (view != NULL) {
++        view->rootContext()->setContextProperty("window", view);
++    }
++}
++
++void UbuntuToolkitModule::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