Ubuntu UI Toolkit

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

  1. moveStyledItem
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Benjamin Zeller
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
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Benjamin Zeller Approve
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.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2004
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/464/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/922/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/951/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/733/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/707/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3890/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3889
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3887
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3888
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3886

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
2005. By Zsombor Egri

fix install

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2005
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/465/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/924/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/953/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/735/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/709/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3899/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3895
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3898
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3897
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3896

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
2006. By Zsombor Egri

move module initialization and type registrations into the library modules

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2006
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/466/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/925/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/954/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/736/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/710/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3904/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3900
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3902
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3903
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3901

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
2007. By Zsombor Egri

fix AP namespace

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2007
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/467/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/926/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/955/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/737/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/711/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3909/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3905
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3907
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3908
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3906

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

Just one small inline comment

review: Needs Fixing
lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated
2008. By Zsombor Egri

build fixes

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2008
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/468/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/927/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/956/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/738/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/712/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3914/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3910
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3913
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3912
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3911

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
2009. By Zsombor Egri

API and test updated

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2009
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/471/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/931/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/960/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/742/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/716/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3933/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3925
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3932
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3931
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3926

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
2010. By Zsombor Egri

fix pep8 hysteria

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2010
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/472/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/934/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/964/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/745/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/719/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3947/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3943
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3945
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3946
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3944

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Replied on the comments

lp:~zsombi/ubuntu-ui-toolkit/moveStyledItem updated
2011. By Zsombor Egri

approach fixing qdoc

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2011
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/473/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/935/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/965/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/746/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/720/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3952/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3948
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3951
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3950
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3949

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
2012. By Zsombor Egri

fix macros in propertiwes/signals for qdoc

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2012
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/477/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/940/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/970/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/751/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/725/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3976/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3972
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3975
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3974
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3973

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
2013. By Zsombor Egri

fixing qdoc

2014. By Zsombor Egri

fix namespace for UbuntuGestures module

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2014
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/478/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/941/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/971/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/752/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/726/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3981/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3977
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3979
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3980
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3978

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
2015. By Zsombor Egri

please ancient pep8

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2015
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/479/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/942/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/972/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/753/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/727/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3986/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3982
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3984
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3985
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3983

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
2016. By Zsombor Egri

fix forward-headers

2017. By Zsombor Egri

fixing last bits on install, removing duplicate gesture classes and unneeded gesture include

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2017
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/480/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/944
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/974
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/755
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/729/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3995/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3994
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3992
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3993
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3991

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
2018. By Zsombor Egri

fix template functions

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2018
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/481/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/945
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/975
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/756
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/730
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4000/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3999
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3997
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3996
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3998

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

review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

Its done, all hail to Zsombor :D

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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)
Revision history for this message
Andrea Bernabei (faenil) wrote :

booom. Well done Zsombor! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.qmake.conf'
2--- .qmake.conf 2016-05-13 09:11:23 +0000
3+++ .qmake.conf 2016-06-22 15:52:01 +0000
4@@ -23,3 +23,8 @@
5 QMAKE_CXXFLAGS += -Wsuggest-override
6 }
7 }
8+
9+# build UbuntuToolkit with or without namespace
10+DEFINES += UBUNTUTOOLKIT_NAMESPACE
11+# build UbuntuGestures with or without namespace
12+DEFINES += UBUNTUGESTURES_NAMESPACE
13
14=== modified file 'components.api'
15--- components.api 2016-06-14 10:04:01 +0000
16+++ components.api 2016-06-22 15:52:01 +0000
17@@ -1,15 +1,15 @@
18-Ubuntu.Components.AbstractButton 1.0 0.1: ActionItem
19+Ubuntu.Components.AbstractButton 1.0 0.1: UbuntuToolkit.UCActionItem
20 property bool hovered
21 signal clicked()
22 signal pressAndHold()
23 property bool pressed
24-Ubuntu.Components.AbstractButton 1.3 UCAbstractButton: ActionItem
25+Ubuntu.Components.AbstractButton 1.3 UbuntuToolkit::UCAbstractButton: UbuntuToolkit.UCActionItem
26 readonly property bool hovered
27 signal clicked()
28 signal pressAndHold()
29 readonly property bool pressed
30- readonly property UCMargins sensingMargins
31-Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
32+ readonly property UbuntuToolkit.UCMargins sensingMargins
33+Ubuntu.Components.Action 1.3 1.0 0.1 UbuntuToolkit::UCAction: QtObject
34 property string description
35 property bool enabled
36 property string iconName
37@@ -24,15 +24,8 @@
38 property var shortcut 1.3
39 property string text
40 property bool visible
41-Ubuntu.Components.Action.Type: Enum
42- Bool
43- Integer
44- None
45- Object
46- Real
47- String
48-Ubuntu.Components.ActionBar 1.3: StyledItem
49- property list<Action> actions
50+Ubuntu.Components.ActionBar 1.3: UbuntuToolkit.UCStyledItemBase
51+ property list<UbuntuToolki>.UCAction> actions
52 property Component delegate
53 property int numberOfSlots
54 Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
55@@ -41,13 +34,13 @@
56 property string overflowIconName
57 property url overflowIconSource
58 property string overflowText
59-Ubuntu.Components.ActionContext 1.0 0.1 UCActionContext: QtObject
60- default property list<Action> actions
61+Ubuntu.Components.ActionContext 1.0 0.1 UbuntuToolkit::UCActionContext: QtObject
62+ default property list<UbuntuToolki>.UCAction> actions
63 property bool active
64- function addAction(Action action)
65- function removeAction(Action action)
66-Ubuntu.Components.ActionItem 1.0 0.1 UCActionItem: StyledItem
67- property Action action
68+ function addAction(UbuntuToolkit.UCAction action)
69+ function removeAction(UbuntuToolkit.UCAction action)
70+Ubuntu.Components.ActionItem 1.0 0.1 UbuntuToolkit::UCActionItem: UbuntuToolkit.UCStyledItemBase
71+ property UbuntuToolkit.UCAction action
72 property string iconName
73 property url iconSource
74 signal triggered(var value)
75@@ -55,20 +48,20 @@
76 function trigger()
77 property string text
78 Ubuntu.Components.ActionList 1.0 0.1: QtObject
79- property list<Action> actions
80- default property list<Action> children
81+ property list<UbuntuToolki>.UCAction> actions
82+ default property list<UbuntuToolki>.UCAction> children
83 Ubuntu.Components.ActionList 1.3: QtObject
84- property list<Action> actions
85- default property list<Action> children
86-Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject
87- default property list<Action> actions
88- readonly property ActionContext globalContext
89- property list<ActionContext> localContexts
90+ property list<UbuntuToolki>.UCAction> actions
91+ default property list<UbuntuToolki>.UCAction> children
92+Ubuntu.Components.ActionManager 1.0 0.1 UbuntuToolkit::UCActionManager: QtObject
93+ default property list<UbuntuToolki>.UCAction> actions
94+ readonly property UbuntuToolkit.UCActionContext globalContext
95+ property list<UbuntuToolki>.UCActionContext> localContexts
96 signal quit()
97- function addAction(Action action)
98- function removeAction(Action action)
99- function addLocalContext(ActionContext context)
100- function removeLocalContext(ActionContext context)
101+ function addAction(UbuntuToolkit.UCAction action)
102+ function removeAction(UbuntuToolkit.UCAction action)
103+ function addLocalContext(UbuntuToolkit.UCActionContext context)
104+ function removeLocalContext(UbuntuToolkit.UCActionContext context)
105 Ubuntu.Components.Popups.ActionSelectionPopover 1.0 0.1: Popover
106 property var actions
107 property Component delegate
108@@ -83,7 +76,7 @@
109 Ubuntu.Components.ActivityIndicator 1.3: AnimatedItem
110 property bool onScreen
111 property bool running
112-Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
113+Ubuntu.Components.AdaptivePageLayout 1.3: UbuntuToolkit.UCPageTreeNode
114 property bool asynchronous
115 readonly property int columns
116 property list<PageColumnsLayou> layouts
117@@ -92,7 +85,7 @@
118 function var removePages(var page)
119 property Page primaryPage
120 property var primaryPageSource
121-Ubuntu.Components.Alarm 1.0 0.1 UCAlarm: QtObject
122+Ubuntu.Components.Alarm 1.0 0.1 UbuntuToolkit::UCAlarm: QtObject
123 property QDateTime date
124 property DaysOfWeek daysOfWeek
125 property bool enabled
126@@ -105,60 +98,19 @@
127 property url sound
128 readonly property Status status
129 property AlarmType type
130-Ubuntu.Components.Alarm.AlarmType: Enum
131- OneTime
132- Repeating
133-Ubuntu.Components.Alarm.DayOfWeek: Enum
134- AutoDetect
135- Daily
136- Friday
137- Monday
138- Saturday
139- Sunday
140- Thursday
141- Tuesday
142- Wednesday
143-Ubuntu.Components.Alarm.DaysOfWeek: Flag
144- AutoDetect
145- Daily
146- Friday
147- Monday
148- Saturday
149- Sunday
150- Thursday
151- Tuesday
152- Wednesday
153-Ubuntu.Components.Alarm.Error: Enum
154- AdaptationError
155- EarlyDate
156- InvalidDate
157- InvalidEvent
158- NoDaysOfWeek
159- NoError
160- OneTimeOnMoreDays
161- OperationPending
162-Ubuntu.Components.Alarm.Operation: Enum
163- Canceling
164- NoOperation
165- Reseting
166- Saving
167-Ubuntu.Components.Alarm.Status: Enum
168- Fail
169- InProgress
170- Ready
171-Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel
172+Ubuntu.Components.AlarmModel 1.0 0.1 UbuntuToolkit::UCAlarmModel: QAbstractListModel
173 readonly property int count
174 function refresh() 1.0
175- function UCAlarm* get(int index)
176-Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject
177+ function UbuntuToolkit.UCAlarm* get(int index)
178+Ubuntu.Components.Argument 1.0 0.1 UbuntuToolkit::UCArgument: QtObject
179 property string help
180 function var at(int i)
181 property string name
182 property bool required
183 property QStringList valueNames
184-Ubuntu.Components.Arguments 1.0 0.1 UCArguments: QtObject
185- default property list<Argument> arguments
186- property Argument defaultArgument
187+Ubuntu.Components.Arguments 1.0 0.1 UbuntuToolkit::UCArguments: QtObject
188+ default property list<UbuntuToolki>.UCArgument> arguments
189+ property UbuntuToolkit.UCArgument defaultArgument
190 readonly property bool error
191 readonly property string errorMessage
192 function printUsage()
193@@ -177,20 +129,20 @@
194 property var icon
195 property bool iconFrame
196 property bool progression
197-Ubuntu.Components.BottomEdge 1.3 UCBottomEdge: StyledItem
198- readonly property BottomEdgeRegion activeRegion
199+Ubuntu.Components.BottomEdge 1.3 UbuntuToolkit::UCBottomEdge: UbuntuToolkit.UCStyledItemBase
200+ readonly property UbuntuToolkit.UCBottomEdgeRegion activeRegion
201 property Component contentComponent
202 readonly property Item contentItem
203 property url contentUrl
204 readonly property DragDirection dragDirection
205 readonly property double dragProgress
206- readonly property BottomEdgeHint hint
207+ readonly property UbuntuToolkit.UCBottomEdgeHint hint
208 signal dragProgressChanged(double dragProgress)
209- signal dragDirectionChanged(BottomEdge.DragDirection direction)
210- signal statusChanged(BottomEdge.Status status)
211+ signal dragDirectionChanged(UbuntuToolkit.UCBottomEdge direction)
212+ signal statusChanged(UbuntuToolkit.UCBottomEdge status)
213 signal contentChanged(url url)
214 signal contentComponentChanged(Component component)
215- signal activeRegionChanged(BottomEdgeRegion activeRegion)
216+ signal activeRegionChanged(UbuntuToolkit.UCBottomEdgeRegion activeRegion)
217 signal commitStarted()
218 signal commitCompleted()
219 signal collapseStarted()
220@@ -198,28 +150,15 @@
221 function commit()
222 function collapse()
223 property bool preloadContent
224- property list<BottomEdgeRegion> regions
225+ property list<UbuntuToolki>.UCBottomEdgeRegion> regions
226 readonly property Status status
227-Ubuntu.Components.BottomEdge.DragDirection: Enum
228- Downwards
229- Undefined
230- Upwards
231-Ubuntu.Components.BottomEdge.Status: Enum
232- Committed
233- Hidden
234- Revealed
235-Ubuntu.Components.BottomEdgeHint 1.3 UCBottomEdgeHint: ActionItem
236+Ubuntu.Components.BottomEdgeHint 1.3 UbuntuToolkit::UCBottomEdgeHint: UbuntuToolkit.UCActionItem
237 property int deactivateTimeout
238 property Flickable flickable
239 signal clicked()
240 property Status status
241- readonly property SwipeArea swipeArea
242-Ubuntu.Components.BottomEdgeHint.Status: Enum
243- Active
244- Hidden
245- Inactive
246- Locked
247-Ubuntu.Components.BottomEdgeRegion 1.3 UCBottomEdgeRegion: QtObject
248+ readonly property UbuntuGestures.UCSwipeArea swipeArea
249+Ubuntu.Components.BottomEdgeRegion 1.3 UbuntuToolkit::UCBottomEdgeRegion: QtObject
250 property Component contentComponent
251 property url contentUrl
252 property bool enabled
253@@ -230,7 +169,7 @@
254 signal exited()
255 signal dragEnded()
256 property double to
257-Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UCBottomEdgeStyle: Item
258+Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UbuntuToolkit::UCBottomEdgeStyle: Item
259 property Item contentItem
260 property Item panel
261 property Animation panelAnimation
262@@ -246,7 +185,7 @@
263 property Gradient gradient
264 property string iconPosition
265 property color strokeColor
266-Ubuntu.Components.Button 1.3: AbstractButton
267+Ubuntu.Components.Button 1.3: UbuntuToolkit.UCAbstractButton
268 property color color
269 property QFont font
270 property Gradient gradient
271@@ -262,17 +201,17 @@
272 readonly property Label title
273 Ubuntu.Components.Captions 1.3: ColumnLayout
274 property int captionStyle
275- readonly property Label subtitle
276- readonly property Label title
277+ readonly property UbuntuToolkit.UCLabel subtitle
278+ readonly property UbuntuToolkit.UCLabel title
279 Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton
280 property bool checked
281-Ubuntu.Components.CheckBox 1.3: AbstractButton
282+Ubuntu.Components.CheckBox 1.3: UbuntuToolkit.UCAbstractButton
283 property bool checked
284 Ubuntu.Components.Clipboard 1.0 0.1: QtObject singleton
285- readonly property MimeData data
286+ readonly property UbuntuToolkit.QQuickMimeData data
287 function push(var data)
288 function clear()
289- function QQuickMimeData* newData()
290+ function UbuntuToolkit.QQuickMimeData* newData()
291 Ubuntu.Components.ColorUtils 1.0 0.1: QtObject singleton
292 function double luminance(color color)
293 Ubuntu.Components.ComboButton 1.1: Button
294@@ -282,7 +221,7 @@
295 property color dropdownColor
296 property bool expanded
297 property double expandedHeight
298-Ubuntu.Components.ComboButton 1.3: AbstractButton
299+Ubuntu.Components.ComboButton 1.3: UbuntuToolkit.UCAbstractButton
300 property double collapsedHeight
301 property color color
302 default property list<QtObject> comboList
303@@ -341,7 +280,7 @@
304 property url source
305 property QSizeF sourceSize
306 readonly property int status
307-Ubuntu.Components.Pickers.DatePicker 1.0 0.1: StyledItem
308+Ubuntu.Components.Pickers.DatePicker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
309 property QDateTime date
310 readonly property int day
311 readonly property int hours
312@@ -355,7 +294,7 @@
313 readonly property int seconds
314 readonly property int week
315 readonly property int year
316-Ubuntu.Components.Pickers.DatePicker 1.3: StyledItem
317+Ubuntu.Components.Pickers.DatePicker 1.3: UbuntuToolkit.UCStyledItemBase
318 property QDateTime date
319 readonly property int day
320 readonly property int hours
321@@ -378,31 +317,31 @@
322 property bool doneButton
323 signal closeClicked()
324 signal doneClicked()
325-Ubuntu.Components.Pickers.Dialer 1.0 0.1: StyledItem
326- property list<QtObject> centerContent
327- readonly property Item centerItem
328- property double handSpace
329- readonly property var hands
330- property double maximumValue
331- signal handUpdated(var hand)
332- property double minimumValue
333- property double size
334-Ubuntu.Components.Pickers.Dialer 1.3: StyledItem
335- property list<QtObject> centerContent
336- readonly property Item centerItem
337- property double handSpace
338- readonly property var hands
339- property double maximumValue
340- signal handUpdated(var hand)
341- property double minimumValue
342- property double size
343-Ubuntu.Components.Pickers.DialerHand 1.0 0.1: StyledItem
344+Ubuntu.Components.Pickers.Dialer 1.0 0.1: UbuntuToolkit.UCStyledItemBase
345+ property list<QtObject> centerContent
346+ readonly property Item centerItem
347+ property double handSpace
348+ readonly property var hands
349+ property double maximumValue
350+ signal handUpdated(var hand)
351+ property double minimumValue
352+ property double size
353+Ubuntu.Components.Pickers.Dialer 1.3: UbuntuToolkit.UCStyledItemBase
354+ property list<QtObject> centerContent
355+ readonly property Item centerItem
356+ property double handSpace
357+ readonly property var hands
358+ property double maximumValue
359+ signal handUpdated(var hand)
360+ property double minimumValue
361+ property double size
362+Ubuntu.Components.Pickers.DialerHand 1.0 0.1: UbuntuToolkit.UCStyledItemBase
363 readonly property Dialer dialer
364 property DialerHandGroup hand
365 readonly property int index
366 default property list<QtObject> overlay
367 property double value
368-Ubuntu.Components.Pickers.DialerHand 1.3: StyledItem
369+Ubuntu.Components.Pickers.DialerHand 1.3: UbuntuToolkit.UCStyledItemBase
370 readonly property Dialer dialer
371 property DialerHandGroup hand
372 readonly property int index
373@@ -428,7 +367,7 @@
374 property Component style
375 property string styleName
376 property string text
377- property ThemeSettings theme
378+ property UbuntuToolkit.UCTheme theme
379 property string title
380 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
381 Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
382@@ -444,7 +383,7 @@
383 property bool showDivider
384 readonly property string swipingState
385 readonly property bool waitingConfirmationForRemoval
386-Ubuntu.Components.ListItems.Empty 1.3: AbstractButton
387+Ubuntu.Components.ListItems.Empty 1.3: UbuntuToolkit.UCAbstractButton
388 property list<Item> backgroundIndicator
389 property bool confirmRemoval
390 readonly property ThinDivider divider
391@@ -502,7 +441,7 @@
392 property bool useDeprecatedToolbar
393 Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
394 property string text
395-Ubuntu.Components.Header 1.3 UCHeader: StyledItem
396+Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: UbuntuToolkit.UCStyledItemBase
397 property bool exposed
398 property Flickable flickable
399 readonly property bool moving
400@@ -518,8 +457,8 @@
401 property color keyColor
402 property string name
403 property url source
404-Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
405-Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
406+Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: UbuntuToolkit.UCMouse
407+Ubuntu.Components.InverseMouseArea 1.0 0.1 UbuntuToolkit::InverseMouseAreaType: MouseArea
408 function bool contains(QPointF point)
409 property Item sensingArea
410 property bool topmostItem
411@@ -551,31 +490,24 @@
412 property int selectedIndex
413 Ubuntu.Components.Label 1.0 0.1: Text
414 property string fontSize
415-Ubuntu.Components.Label 1.3 UCLabel: Text
416+Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text
417 property string fontSize
418 property TextSize textSize
419-Ubuntu.Components.Label.TextSize: Enum
420- Large
421- Medium
422- Small
423- XLarge
424- XSmall
425- XxSmall
426 Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
427 readonly property string currentLayout
428 property list<ConditionalLayout> layouts
429-Ubuntu.Components.ListItem 1.3 1.2 UCListItem: StyledItem
430- property Action action
431+Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: UbuntuToolkit.UCStyledItemBase
432+ property UbuntuToolkit.UCAction action
433 property color color
434 readonly property Item contentItem
435 readonly property bool contentMoving
436- readonly property UCListItemDivider divider
437+ readonly property UbuntuToolkit.UCListItemDivider divider
438 property bool dragMode
439 readonly property bool dragging
440- readonly property UCListItemExpansion expansion 1.3
441+ readonly property UbuntuToolkit.UCListItemExpansion expansion 1.3
442 property color highlightColor
443 readonly property bool highlighted
444- property ListItemActions leadingActions
445+ property UbuntuToolkit.UCListItemActions leadingActions
446 property list<Item> listItemChildren
447 default property list<QtObject> listItemData
448 signal clicked()
449@@ -586,9 +518,9 @@
450 property bool selected
451 property bool swipeEnabled 1.3
452 readonly property bool swiped 1.3
453- property ListItemActions trailingActions
454-Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject
455- property list<Action> actions
456+ property UbuntuToolkit.UCListItemActions trailingActions
457+Ubuntu.Components.ListItemActions 1.2 UbuntuToolkit::UCListItemActions: QtObject
458+ property list<UbuntuToolki>.UCAction> actions
459 default property list<QtObject> data
460 property Component delegate
461 Ubuntu.Components.ListItemDrag 1.2: QtObject
462@@ -598,33 +530,23 @@
463 property int minimumIndex
464 readonly property Status status
465 readonly property int to
466-Ubuntu.Components.ListItemDrag.Status: Enum
467- Dropped
468- Moving
469- Started
470-Ubuntu.Components.ListItemLayout 1.3 UCListItemLayout: SlotsLayout
471- readonly property Label subtitle
472- readonly property Label summary
473- readonly property Label title
474-Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UCListItemStyle: Item
475+Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: UbuntuToolkit.UCSlotsLayout
476+ readonly property UbuntuToolkit.UCLabel subtitle
477+ readonly property UbuntuToolkit.UCLabel summary
478+ readonly property UbuntuToolkit.UCLabel title
479+Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UbuntuToolkit::UCListItemStyle: Item
480 readonly property bool animatePanels
481 property Item dragPanel
482 property PropertyAnimation dropAnimation
483 readonly property Flickable flickable 1.3
484 readonly property int listItemIndex 1.3
485- function swipeEvent(SwipeEvent event)
486+ function swipeEvent(UCSwipeEvent event)
487 function rebound()
488 property Animation snapAnimation
489-Ubuntu.Components.LiveTimer 1.3 LiveTimer: QtObject
490+Ubuntu.Components.LiveTimer 1.3 UbuntuToolkit::LiveTimer: QtObject
491 property Frequency frequency
492 signal trigger()
493 property QDateTime relativeTime
494-Ubuntu.Components.LiveTimer.Frequency: Enum
495- Disabled
496- Hour
497- Minute
498- Relative
499- Second
500 Ubuntu.Components.MainView 1.0 0.1: MainViewBase
501 property bool automaticOrientation
502 default property list<QtObject> contentsItem
503@@ -632,13 +554,13 @@
504 Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
505 property bool automaticOrientation
506 default property list<QtObject> contentsItem
507-Ubuntu.Components.MainView 1.3: MainViewBase
508+Ubuntu.Components.MainView 1.3: UbuntuToolkit.UCMainViewBase
509 property bool automaticOrientation
510 default property list<QtObject> contentsItem
511-Ubuntu.Components.MainViewBase 1.3 UCMainViewBase: PageTreeNode
512- readonly property PopupContext actionContext
513- readonly property ActionManager actionManager
514- property list<Action> actions
515+Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: UbuntuToolkit.UCPageTreeNode
516+ readonly property UbuntuToolkit.UCPopupContext actionContext
517+ readonly property UbuntuToolkit.UCActionManager actionManager
518+ property list<UbuntuToolki>.UCAction> actions
519 property bool anchorToKeyboard
520 property string applicationName
521 property color backgroundColor
522@@ -649,21 +571,21 @@
523 signal headerColorChanged(color headerColor)
524 signal backgroundColorChanged(color backgroundColor)
525 signal footerColorChanged(color footerColor)
526- signal actionManagerChanged(ActionManager actionManager)
527- signal actionContextChanged(PopupContext actionContext)
528+ signal actionManagerChanged(UbuntuToolkit.UCActionManager actionManager)
529+ signal actionContextChanged(UbuntuToolkit.UCPopupContext actionContext)
530 Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
531 function double clamp(double x, double min, double max)
532 function double lerp(double delta, double from, double to)
533 function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
534 function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
535-Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject
536+Ubuntu.Components.MimeData 1.0 0.1 UbuntuToolkit::QQuickMimeData: QtObject
537 property color color
538 property var data
539 readonly property QStringList formats
540 property string html
541 property string text
542 property list<url> urls
543-Ubuntu.Components.Mouse 1.0 0.1 UCMouse: QtObject
544+Ubuntu.Components.Mouse 1.0 0.1 UbuntuToolkit::UCMouse: QtObject
545 readonly property Qt.MouseButtons acceptedButtons
546 property int clickAndHoldThreshold
547 property bool enabled
548@@ -679,9 +601,6 @@
549 signal entered(QQuickMouseEvent event, Item host)
550 signal exited(QQuickMouseEvent event, Item host)
551 property Priority priority
552-Ubuntu.Components.Mouse.Priority: Enum
553- AfterItem
554- BeforeItem
555 Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton
556 property bool enabled
557 signal enabledChanged(bool value)
558@@ -744,14 +663,14 @@
559 readonly property bool rotating
560 property bool transitionEnabled
561 Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
562- property list<Action> actions
563+ property list<UbuntuToolki>.UCAction> actions
564 property Flickable flickable
565 property string title
566 property Item tools
567 Ubuntu.Components.Page 1.1 Page11: Page10
568 readonly property PageHeadConfiguration head
569-Ubuntu.Components.Page 1.3: PageTreeNode
570- readonly property ActionContext actionContext
571+Ubuntu.Components.Page 1.3: UbuntuToolkit.UCPageTreeNode
572+ readonly property UbuntuToolkit.UCActionContext actionContext
573 property Flickable flickable
574 readonly property PageHeadConfiguration head
575 property Item header
576@@ -765,15 +684,15 @@
577 default property list<PageColum> data
578 property bool when
579 Ubuntu.Components.PageHeadConfiguration 1.1: Object
580- property list<Action> actions
581- property Action backAction
582+ property list<UbuntuToolki>.UCAction> actions
583+ property UbuntuToolkit.UCAction backAction
584 property Item contents
585 property color foregroundColor
586 property string preset
587 readonly property PageHeadSections sections
588 Ubuntu.Components.PageHeadConfiguration 1.3: Object
589- property list<Action> actions
590- property Action backAction
591+ property list<UbuntuToolki>.UCAction> actions
592+ property UbuntuToolkit.UCAction backAction
593 property Item contents
594 property Flickable flickable
595 property color foregroundColor
596@@ -787,18 +706,18 @@
597 property var model
598 property int selectedIndex
599 Ubuntu.Components.PageHeadSections 1.3: QtObject
600- property list<Action> actions
601+ property list<UbuntuToolki>.UCAction> actions
602 property bool enabled
603 property var model
604 property int selectedIndex
605 Ubuntu.Components.PageHeadState 1.1: State
606- property list<Action> actions
607- property Action backAction
608+ property list<UbuntuToolki>.UCAction> actions
609+ property UbuntuToolkit.UCAction backAction
610 property Item contents
611 property PageHeadConfiguration head
612 Ubuntu.Components.PageHeadState 1.3: State
613- property list<Action> actions
614- property Action backAction
615+ property list<UbuntuToolki>.UCAction> actions
616+ property UbuntuToolkit.UCAction backAction
617 property Item contents
618 property PageHeadConfiguration head
619 Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
620@@ -820,11 +739,11 @@
621 property color textColor
622 property double textLeftMargin
623 property int textSize
624-Ubuntu.Components.PageHeader 1.3: Header
625+Ubuntu.Components.PageHeader 1.3: UbuntuToolkit.UCHeader
626 property Item contents
627 property Item extension
628 readonly property ActionBar leadingActionBar
629- property list<Action> navigationActions
630+ property list<UbuntuToolki>.UCAction> navigationActions
631 readonly property Sections sections
632 property string subtitle
633 property string title
634@@ -845,19 +764,19 @@
635 function var push(var page, var properties)
636 function var pop()
637 function var clear()
638-Ubuntu.Components.PageStack 1.3: PageTreeNode
639+Ubuntu.Components.PageStack 1.3: UbuntuToolkit.UCPageTreeNode
640 property Item currentPage
641 property int depth
642 function var push(var page, var properties)
643 function var pop()
644 function var clear()
645-Ubuntu.Components.PageTreeNode 1.3 UCPageTreeNode: StyledItem
646+Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: UbuntuToolkit.UCStyledItemBase
647 property bool active
648 readonly property Item activeLeafNode
649 property bool isLeaf
650 signal isLeafChanged(bool isLeaf)
651 signal activeChanged(bool active)
652- signal parentNodeChanged(PageTreeNode parentNode)
653+ signal parentNodeChanged(UbuntuToolkit.UCPageTreeNode parentNode)
654 signal pageStackChanged(Item pageStack)
655 signal activeLeafNodeChanged(Item activeLeafNode)
656 signal propagatedChanged(QtObject propagated)
657@@ -865,7 +784,7 @@
658 signal isPageTreeNodeChanged(bool isPageTreeNode)
659 function dumpNodeTree()
660 property Item pageStack
661- property PageTreeNode parentNode
662+ property UbuntuToolkit.UCPageTreeNode parentNode
663 property Item toolbar
664 Ubuntu.Components.Themes.Palette 0.1: QtObject
665 property PaletteValues normal
666@@ -948,7 +867,7 @@
667 property double triggerSize
668 Ubuntu.PerformanceMetrics.PerformanceOverlay 1.0 0.1: Item
669 property bool active
670-Ubuntu.Components.Pickers.Picker 1.0 0.1: StyledItem
671+Ubuntu.Components.Pickers.Picker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
672 property bool circular
673 property Component delegate
674 property bool live
675@@ -956,7 +875,7 @@
676 property var model
677 readonly property bool moving
678 property int selectedIndex
679-Ubuntu.Components.Pickers.Picker 1.3: StyledItem
680+Ubuntu.Components.Pickers.Picker 1.3: UbuntuToolkit.UCStyledItemBase
681 property bool circular
682 property Component delegate
683 property double itemHeight
684@@ -967,7 +886,7 @@
685 property int selectedIndex
686 Ubuntu.Components.Pickers.PickerDelegate 1.0 0.1: AbstractButton
687 readonly property Picker picker
688-Ubuntu.Components.Pickers.PickerDelegate 1.3: AbstractButton
689+Ubuntu.Components.Pickers.PickerDelegate 1.3: UbuntuToolkit.UCAbstractButton
690 readonly property Picker picker
691 Ubuntu.Components.Pickers.PickerPanel 1.0 0.1: Object singleton
692 function var openDatePicker(var caller, var property, var mode)
693@@ -999,7 +918,7 @@
694 property Item pointerTarget
695 property Component style
696 property string styleName
697- property ThemeSettings theme
698+ property UbuntuToolkit.UCTheme theme
699 Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
700 property Item dismissArea
701 property PropertyAnimation fadingAnimation
702@@ -1012,7 +931,7 @@
703 property bool grabDismissAreaEvents
704 function var show()
705 function var hide()
706-Ubuntu.Components.PopupContext 1.3 UCPopupContext: ActionContext
707+Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: UbuntuToolkit.UCActionContext
708 Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
709 Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
710 property bool indeterminate
711@@ -1035,15 +954,15 @@
712 property color keyColor
713 property string name
714 property url source
715-Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
716-Ubuntu.Components.PullToRefresh 1.1: StyledItem
717+Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuToolkit.UCUbuntuShape
718+Ubuntu.Components.PullToRefresh 1.1: UbuntuToolkit.UCStyledItemBase
719 property Component content
720 signal refresh()
721 readonly property double offset
722 property bool refreshing
723 readonly property bool releaseToRefresh
724 property Flickable target
725-Ubuntu.Components.PullToRefresh 1.3: StyledItem
726+Ubuntu.Components.PullToRefresh 1.3: UbuntuToolkit.UCStyledItemBase
727 property Component content
728 signal refresh()
729 readonly property double offset
730@@ -1054,26 +973,27 @@
731 property double activationThreshold
732 property Component defaultContent
733 property bool releaseToRefresh
734+Ubuntu.Components.QQuickImageBase 1.0 0.1 UbuntuToolkit::UCQQuickImageExtension: QQuickImageBase
735 Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
736 readonly property UPMGraphModel graphModel
737 signal frameRendered(qlonglong renderTime)
738 property int period
739 property int samples
740 property RenderTimer.TimerType timerType
741-Ubuntu.Components.ScrollView 1.3: StyledItem
742+Ubuntu.Components.ScrollView 1.3: UbuntuToolkit.UCStyledItemBase
743 default property Item contentItem
744 readonly property Flickable flickableItem
745 property Scrollbar horizontalScrollbar
746 property Scrollbar verticalScrollbar
747 readonly property Item viewport
748-Ubuntu.Components.Scrollbar 1.0 0.1: StyledItem
749- property int align
750- property Flickable flickableItem
751-Ubuntu.Components.Scrollbar 1.3: StyledItem
752- property int align
753- property Flickable flickableItem
754-Ubuntu.Components.Sections 1.3: StyledItem
755- property list<Action> actions
756+Ubuntu.Components.Scrollbar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
757+ property int align
758+ property Flickable flickableItem
759+Ubuntu.Components.Scrollbar 1.3: UbuntuToolkit.UCStyledItemBase
760+ property int align
761+ property Flickable flickableItem
762+Ubuntu.Components.Sections 1.3: UbuntuToolkit.UCStyledItemBase
763+ property list<UbuntuToolki>.UCAction> actions
764 property var model
765 property int selectedIndex
766 Ubuntu.Components.Styles.SectionsStyle 1.3: Item
767@@ -1082,7 +1002,7 @@
768 property color selectedSectionColor
769 property int textSize
770 property color underlineColor
771-Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject
772+Ubuntu.Components.ServiceProperties 1.1 UbuntuToolkit::UCServiceProperties: QtObject
773 property string adaptorInterface 1.1
774 readonly property string error 1.1
775 property string path 1.1
776@@ -1090,15 +1010,6 @@
777 property string serviceInterface 1.1
778 readonly property Status status 1.1
779 property ServiceType type 1.1
780-Ubuntu.Components.ServiceProperties.ServiceType: Enum
781- Session
782- System
783- Undefined
784-Ubuntu.Components.ServiceProperties.Status: Enum
785- Active
786- ConnectionError
787- Inactive
788- Synchronizing
789 Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase
790 default property list<QtObject> container
791 property double contentsHeight
792@@ -1119,7 +1030,7 @@
793 property string value
794 Ubuntu.Components.ListItems.SingleValue 1.3: Base
795 property string value
796-Ubuntu.Components.Slider 1.0 0.1: StyledItem
797+Ubuntu.Components.Slider 1.0 0.1: UbuntuToolkit.UCStyledItemBase
798 property bool live
799 property double maximumValue
800 signal touched(bool onThumb)
801@@ -1127,7 +1038,7 @@
802 property double minimumValue
803 readonly property bool pressed
804 property double value
805-Ubuntu.Components.Slider 1.3: StyledItem
806+Ubuntu.Components.Slider 1.3: UbuntuToolkit.UCStyledItemBase
807 property bool live
808 property double maximumValue
809 signal touched(bool onThumb)
810@@ -1139,16 +1050,11 @@
811 Ubuntu.Components.SliderUtils 0.1 1.0
812 Ubuntu.Components.SlotsAttached 1.3: QtObject
813 property bool overrideVerticalPositioning
814- readonly property SlotsLayoutPadding padding
815- property SlotsLayout.UCSlotPosition position
816-Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item
817+ readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
818+ property UbuntuToolkit.UCSlotsLayout position
819+Ubuntu.Components.SlotsLayout 1.3 UbuntuToolkit::UCSlotsLayout: Item
820 property Item mainSlot
821- readonly property SlotsLayoutPadding padding
822-Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
823- First
824- Last
825- Leading
826- Trailing
827+ readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
828 Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject
829 property double bottom
830 property double leading
831@@ -1157,13 +1063,13 @@
832 Ubuntu.Components.SortBehavior 1.1: QtObject
833 property Qt.SortOrder order
834 property string property
835-Ubuntu.Components.SortFilterModel 1.1 QSortFilterProxyModelQML: QSortFilterProxyModel
836+Ubuntu.Components.SortFilterModel 1.1 UbuntuToolkit::QSortFilterProxyModelQML: QSortFilterProxyModel
837 readonly property int count
838- readonly property FilterBehavior filter
839+ readonly property UbuntuToolkit.FilterBehavior filter
840 function QVariantMap get(int row)
841 function int count()
842 property QAbstractItemModel model
843- readonly property SortBehavior sort
844+ readonly property UbuntuToolkit.SortBehavior sort
845 Ubuntu.Components.ListItems.Standard 1.0 0.1: Empty
846 property Item control
847 property string fallbackIconName
848@@ -1178,10 +1084,10 @@
849 property var icon
850 property bool iconFrame
851 property bool progression
852-Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject
853-Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject
854+Ubuntu.Components.StateSaver 1.0 0.1 UbuntuToolkit::UCStateSaver: QtObject
855+Ubuntu.Components.StyleHints 1.3 UbuntuToolkit::UCStyleHints: QtObject
856 property bool ignoreUnknownProperties
857-Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item
858+Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UbuntuToolkit::UCStyledItemBase: Item
859 property bool activeFocusOnPress 1.3
860 readonly property bool keyNavigationFocus 1.3
861 signal activeFocusOnTabChanged2() 1.3
862@@ -1189,12 +1095,12 @@
863 function bool requestFocus() 1.3
864 property Component style
865 property string styleName 1.3
866- property ThemeSettings theme 1.3
867+ property UbuntuToolkit.UCTheme theme 1.3
868 Ubuntu.Components.ListItems.Subtitled 1.0 0.1: Base
869 property string subText
870 Ubuntu.Components.ListItems.Subtitled 1.3: Base
871 property string subText
872-Ubuntu.Components.SwipeArea 1.3 UCSwipeArea: Item
873+Ubuntu.Components.SwipeArea 1.3 UbuntuGestures::UCSwipeArea: Item
874 property Direction direction
875 readonly property double distance
876 readonly property bool dragging
877@@ -1209,37 +1115,26 @@
878 signal grabGestureChanged(bool grabGesture)
879 readonly property bool pressed
880 readonly property QPointF touchPosition
881-Ubuntu.Components.SwipeArea.Direction: Enum
882- Downwards
883- Horizontal
884- Leftwards
885- Rightwards
886- Upwards
887- Vertical
888 Ubuntu.Components.SwipeEvent 1.2: QtObject
889 property QPointF content
890 readonly property QPointF from
891 readonly property Status status
892 readonly property QPointF to
893-Ubuntu.Components.SwipeEvent.Status: Enum
894- Finished
895- Started
896- Updated
897 Ubuntu.Components.Switch 1.0 0.1: AbstractButton
898 property bool checked
899-Ubuntu.Components.Switch 1.3: AbstractButton
900+Ubuntu.Components.Switch 1.3: UbuntuToolkit.UCAbstractButton
901 property bool checked
902 Ubuntu.Components.Tab 1.0 0.1: PageTreeNode
903 property url iconSource
904 readonly property int index
905 property Item page
906 property string title
907-Ubuntu.Components.Tab 1.3: PageTreeNode
908+Ubuntu.Components.Tab 1.3: UbuntuToolkit.UCPageTreeNode
909 property url iconSource
910 readonly property int index
911 property Item page
912 property string title
913-Ubuntu.Components.TabBar 1.0 0.1: StyledItem
914+Ubuntu.Components.TabBar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
915 property bool alwaysSelectionMode
916 property bool animate
917 property var model
918@@ -1247,7 +1142,7 @@
919 property int selectedIndex
920 property bool selectionMode
921 property Item tabsItem
922-Ubuntu.Components.TabBar 1.3: StyledItem
923+Ubuntu.Components.TabBar 1.3: UbuntuToolkit.UCStyledItemBase
924 property bool alwaysSelectionMode
925 property bool animate
926 property var model
927@@ -1262,7 +1157,7 @@
928 property int selectedTabIndex
929 property TabBar tabBar
930 default property list<QtObject> tabChildren
931-Ubuntu.Components.Tabs 1.3: PageTreeNode
932+Ubuntu.Components.Tabs 1.3: UbuntuToolkit.UCPageTreeNode
933 readonly property int count
934 readonly property Item currentPage
935 readonly property Tab selectedTab
936@@ -1288,7 +1183,7 @@
937 function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
938 function removeTimeConstraintsFromSwipeArea(Item item)
939 readonly property bool touchPresent
940-Ubuntu.Components.TextArea 1.0 0.1: StyledItem
941+Ubuntu.Components.TextArea 1.0 0.1: UbuntuToolkit.UCStyledItemBase
942 property bool autoExpand
943 property bool autoSize
944 property url baseUrl
945@@ -1346,7 +1241,7 @@
946 property int textFormat
947 property int verticalAlignment
948 property int wrapMode
949-Ubuntu.Components.TextArea 1.3: StyledItem
950+Ubuntu.Components.TextArea 1.3: UbuntuToolkit.UCStyledItemBase
951 property bool autoExpand
952 property bool autoSize
953 property url baseUrl
954@@ -1407,7 +1302,7 @@
955 property int textFormat
956 property int verticalAlignment
957 property int wrapMode
958-Ubuntu.Components.TextField 1.0 0.1: ActionItem
959+Ubuntu.Components.TextField 1.0 0.1: UbuntuToolkit.UCActionItem
960 readonly property bool acceptableInput
961 property bool autoScroll
962 readonly property bool canPaste
963@@ -1468,7 +1363,7 @@
964 readonly property int selectionStart
965 property QValidator validator
966 property int verticalAlignment
967-Ubuntu.Components.TextField 1.3: ActionItem
968+Ubuntu.Components.TextField 1.3: UbuntuToolkit.UCActionItem
969 readonly property bool acceptableInput
970 property bool autoScroll
971 readonly property bool canPaste
972@@ -1531,27 +1426,27 @@
973 property int verticalAlignment
974 Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item
975 property QImage image
976-Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject
977+Ubuntu.Components.ThemeSettings 1.3 UbuntuToolkit::UCTheme: QtObject
978 property string name
979 property QtObject palette
980- readonly property ThemeSettings parentTheme
981+ readonly property UbuntuToolkit.UCTheme parentTheme
982 Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
983 Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
984 Ubuntu.Components.Toolbar 0.1: Panel
985 property Item tools
986-Ubuntu.Components.Toolbar 1.3: StyledItem
987+Ubuntu.Components.Toolbar 1.3: UbuntuToolkit.UCStyledItemBase
988 readonly property ActionBar leadingActionBar
989 readonly property ActionBar trailingActionBar
990-Ubuntu.Components.ToolbarButton 1.0 0.1: StyledItem
991- property Action action
992+Ubuntu.Components.ToolbarButton 1.0 0.1: UbuntuToolkit.UCStyledItemBase
993+ property UbuntuToolkit.UCAction action
994 property string iconName
995 property url iconSource
996 signal triggered(var value)
997 function trigger(var value)
998 function trigger()
999 property string text
1000-Ubuntu.Components.ToolbarButton 1.3: StyledItem
1001- property Action action
1002+Ubuntu.Components.ToolbarButton 1.3: UbuntuToolkit.UCStyledItemBase
1003+ property UbuntuToolkit.UCAction action
1004 property string iconName
1005 property url iconSource
1006 signal triggered(var value)
1007@@ -1572,28 +1467,12 @@
1008 property Item pageStack
1009 Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
1010 property Component defaultDelegate
1011-UCActionContextAttached: QtObject
1012 Ubuntu.Components.UCApplication 1.0 0.1: QtObject
1013 property string applicationName
1014 property QtObject inputMethod
1015 Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
1016 function double sizeToPixels(string size)
1017 function double modularScale(string size)
1018-UCListItemDivider: Item
1019- property color colorFrom
1020- property color colorTo
1021-UCListItemExpansion: QtObject
1022- property bool expanded
1023- property double height
1024-UCMargins: QtObject
1025- property double all
1026- property double bottom
1027- property double left
1028- property double right
1029- property double top
1030-UCStateSaverAttached: QtObject
1031- property bool enabled
1032- property string properties
1033 Ubuntu.Components.UCUnits 1.0 0.1: QtObject
1034 property float gridUnit
1035 function float dp(float value)
1036@@ -1606,14 +1485,11 @@
1037 property int samples
1038 readonly property int shift
1039 Ubuntu.Components.Ubuntu 1.2: QtObject singleton
1040-Ubuntu.Components.Ubuntu 1.3: Ubuntu singleton
1041+Ubuntu.Components.Ubuntu 1.3: UbuntuToolkit.UCNamespace singleton
1042 function ushort version(uchar major, uchar minor)
1043 readonly property ushort toolkitVersion
1044 readonly property ushort toolkitVersionMajor
1045 readonly property ushort toolkitVersionMinor
1046-Ubuntu.Components.Ubuntu.CaptionsStyle: Enum
1047- SummaryCaptionStyle
1048- TitleCaptionStyle
1049 Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton
1050 readonly property int BriskDuration
1051 readonly property int FastDuration
1052@@ -1668,6 +1544,13 @@
1053 readonly property color silk
1054 readonly property color slate
1055 readonly property color warmGrey
1056+Ubuntu.Components.UbuntuGestures.UCSwipeArea: Enum
1057+ Downwards
1058+ Horizontal
1059+ Leftwards
1060+ Rightwards
1061+ Upwards
1062+ Vertical
1063 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
1064 property int expandedIndex
1065 Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
1066@@ -1677,7 +1560,7 @@
1067 readonly property PullToRefresh pullToRefresh
1068 Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation
1069 Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation
1070-Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UCUbuntuShape: Item
1071+Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UbuntuToolkit::UCUbuntuShape: Item
1072 property Aspect aspect 1.3
1073 property color backgroundColor 1.3
1074 property BackgroundMode backgroundMode 1.3
1075@@ -1700,58 +1583,180 @@
1076 property WrapMode sourceVerticalWrapMode 1.3
1077 property bool stretched
1078 property VAlignment verticalAlignment
1079-Ubuntu.Components.UbuntuShape.Aspect: Enum
1080- DropShadow
1081- Flat
1082- Inset
1083-Ubuntu.Components.UbuntuShape.BackgroundMode: Enum
1084- SolidColor
1085- VerticalGradient
1086-Ubuntu.Components.UbuntuShape.FillMode: Enum
1087+Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuToolkit.UCUbuntuShape
1088+ property color overlayColor
1089+ property QRectF overlayRect
1090+Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
1091+ function var findChild(var obj, var objectName)
1092+ function var findInvisibleChild(var obj, var objectName)
1093+ function var findChildWithProperty(var item, var property, var value)
1094+ function var centerOf(var item)
1095+ function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
1096+ function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
1097+ function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
1098+ function var tryCompareFunction(var func, var expectedResult, var timeout)
1099+ function var typeString(var string)
1100+ function var warningFormat(var line, var column, var message)
1101+ function var waitForHeaderAnimation(var mainView)
1102+ readonly property QuickTestUtil testUtil
1103+Ubuntu.Test.UbuntuTestCase 1.3 UbuntuTestCase13: TestCase
1104+ function var findChild(var obj, var objectName)
1105+ function var findInvisibleChild(var obj, var objectName)
1106+ function var findChildWithProperty(var item, var property, var value)
1107+ function var centerOf(var item)
1108+ function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
1109+ function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
1110+ function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
1111+ function var tryCompareFunction(var func, var expectedResult, var timeout)
1112+ function var typeString(var string)
1113+ function var warningFormat(var line, var column, var message)
1114+ function var waitForHeaderAnimation(var mainView)
1115+ readonly property QuickTestUtil testUtil
1116+Ubuntu.Components.UbuntuToolkit.LiveTimer: Enum
1117+ Disabled
1118+ Hour
1119+ Minute
1120+ Relative
1121+ Second
1122+Ubuntu.Components.UbuntuToolkit.UCAction: Enum
1123+ Bool
1124+ Integer
1125+ None
1126+ Object
1127+ Real
1128+ String
1129+UbuntuToolkit.UCActionContextAttached: QtObject
1130+Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1131+ Fail
1132+ InProgress
1133+ Ready
1134+Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1135+ Canceling
1136+ NoOperation
1137+ Reseting
1138+ Saving
1139+Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1140+ AdaptationError
1141+ EarlyDate
1142+ InvalidDate
1143+ InvalidEvent
1144+ NoDaysOfWeek
1145+ NoError
1146+ OneTimeOnMoreDays
1147+ OperationPending
1148+Ubuntu.Components.UbuntuToolkit.UCAlarm: Flag
1149+ AutoDetect
1150+ Daily
1151+ Friday
1152+ Monday
1153+ Saturday
1154+ Sunday
1155+ Thursday
1156+ Tuesday
1157+ Wednesday
1158+Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1159+ AutoDetect
1160+ Daily
1161+ Friday
1162+ Monday
1163+ Saturday
1164+ Sunday
1165+ Thursday
1166+ Tuesday
1167+ Wednesday
1168+Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1169+ OneTime
1170+ Repeating
1171+Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
1172+ Committed
1173+ Hidden
1174+ Revealed
1175+Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
1176+ Downwards
1177+ Undefined
1178+ Upwards
1179+Ubuntu.Components.UbuntuToolkit.UCBottomEdgeHint: Enum
1180+ Active
1181+ Hidden
1182+ Inactive
1183+ Locked
1184+Ubuntu.Components.UbuntuToolkit.UCDragEvent: Enum
1185+ Dropped
1186+ Moving
1187+ Started
1188+Ubuntu.Components.UbuntuToolkit.UCLabel: Enum
1189+ Large
1190+ Medium
1191+ Small
1192+ XLarge
1193+ XSmall
1194+ XxSmall
1195+UbuntuToolkit.UCListItemDivider: Item
1196+ property color colorFrom
1197+ property color colorTo
1198+UbuntuToolkit.UCListItemExpansion: QtObject
1199+ property bool expanded
1200+ property double height
1201+UbuntuToolkit.UCMargins: QtObject
1202+ property double all
1203+ property double bottom
1204+ property double left
1205+ property double right
1206+ property double top
1207+Ubuntu.Components.UbuntuToolkit.UCMouse: Enum
1208+ AfterItem
1209+ BeforeItem
1210+Ubuntu.Components.UbuntuToolkit.UCNamespace: Enum
1211+ SummaryCaptionStyle
1212+ TitleCaptionStyle
1213+Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
1214+ Active
1215+ ConnectionError
1216+ Inactive
1217+ Synchronizing
1218+Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
1219+ Session
1220+ System
1221+ Undefined
1222+Ubuntu.Components.UbuntuToolkit.UCSlotsLayout: Enum
1223+ First
1224+ Last
1225+ Leading
1226+ Trailing
1227+UbuntuToolkit.UCStateSaverAttached: QtObject
1228+ property bool enabled
1229+ property string properties
1230+Ubuntu.Components.UbuntuToolkit.UCSwipeEvent: Enum
1231+ Finished
1232+ Started
1233+ Updated
1234+Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1235+ Repeat
1236+ Transparent
1237+Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1238+ AlignBottom
1239+ AlignTop
1240+ AlignVCenter
1241+Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1242+ AlignHCenter
1243+ AlignLeft
1244+ AlignRight
1245+Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1246 Pad
1247 PreserveAspectCrop
1248 PreserveAspectFit
1249 Stretch
1250-Ubuntu.Components.UbuntuShape.HAlignment: Enum
1251- AlignHCenter
1252- AlignLeft
1253- AlignRight
1254-Ubuntu.Components.UbuntuShape.VAlignment: Enum
1255- AlignBottom
1256- AlignTop
1257- AlignVCenter
1258-Ubuntu.Components.UbuntuShape.WrapMode: Enum
1259- Repeat
1260- Transparent
1261-Ubuntu.Components.UbuntuShapeOverlay 1.2 UCUbuntuShapeOverlay: UbuntuShape
1262- property color overlayColor
1263- property QRectF overlayRect
1264-Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
1265- function var findChild(var obj, var objectName)
1266- function var findInvisibleChild(var obj, var objectName)
1267- function var findChildWithProperty(var item, var property, var value)
1268- function var centerOf(var item)
1269- function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
1270- function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
1271- function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
1272- function var tryCompareFunction(var func, var expectedResult, var timeout)
1273- function var typeString(var string)
1274- function var warningFormat(var line, var column, var message)
1275- function var waitForHeaderAnimation(var mainView)
1276- readonly property QuickTestUtil testUtil
1277-Ubuntu.Test.UbuntuTestCase 1.3 UbuntuTestCase13: TestCase
1278- function var findChild(var obj, var objectName)
1279- function var findInvisibleChild(var obj, var objectName)
1280- function var findChildWithProperty(var item, var property, var value)
1281- function var centerOf(var item)
1282- function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
1283- function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
1284- function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
1285- function var tryCompareFunction(var func, var expectedResult, var timeout)
1286- function var typeString(var string)
1287- function var warningFormat(var line, var column, var message)
1288- function var waitForHeaderAnimation(var mainView)
1289- readonly property QuickTestUtil testUtil
1290+Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1291+ SolidColor
1292+ VerticalGradient
1293+Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1294+ DropShadow
1295+ Flat
1296+ Inset
1297+Ubuntu.Components.UbuntuToolkit.UCViewItemsAttached: Enum
1298+ CollapseOnOutsidePress
1299+ Exclusive
1300+ UnlockExpanded
1301 Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
1302 signal opened(QStringList uris)
1303 Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
1304@@ -1775,14 +1780,10 @@
1305 property list<int> expandedIndices
1306 property int expansionFlags
1307 signal selectedIndicesChanged(list<int> indices)
1308- signal dragUpdated(ListItemDrag event)
1309+ signal dragUpdated(UCDragEvent event)
1310 signal expandedIndicesChanged(list<int> indices)
1311 property bool selectMode
1312 property list<int> selectedIndices
1313-Ubuntu.Components.ViewItems.ExpansionFlag: Enum
1314- CollapseOnOutsidePress
1315- Exclusive
1316- UnlockExpanded
1317 Ubuntu.Components.i18n 1.0 0.1: QtObject
1318 property string domain
1319 property string language
1320
1321=== modified file 'debian/libubuntugestures5-dev.install'
1322--- debian/libubuntugestures5-dev.install 2016-03-04 11:58:12 +0000
1323+++ debian/libubuntugestures5-dev.install 2016-06-22 15:52:01 +0000
1324@@ -1,20 +1,11 @@
1325-usr/include/*/qt5/UbuntuGestures/AbstractTimer
1326-usr/include/*/qt5/UbuntuGestures/AbstractTimerFactory
1327-usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
1328 usr/include/*/qt5/UbuntuGestures/DebugHelpers
1329-usr/include/*/qt5/UbuntuGestures/FakeTimeSource
1330-usr/include/*/qt5/UbuntuGestures/FakeTimer
1331-usr/include/*/qt5/UbuntuGestures/FakeTimerFactory
1332 usr/include/*/qt5/UbuntuGestures/Pool
1333-usr/include/*/qt5/UbuntuGestures/RealTimeSource
1334-usr/include/*/qt5/UbuntuGestures/SharedTimeSource
1335-usr/include/*/qt5/UbuntuGestures/TimeSource
1336 usr/include/*/qt5/UbuntuGestures/Timer
1337-usr/include/*/qt5/UbuntuGestures/TimerFactory
1338 usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
1339 usr/include/*/qt5/UbuntuGestures/TouchRegistry
1340 usr/include/*/qt5/UbuntuGestures/UbuntuGestures
1341 usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
1342+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesModule
1343 usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
1344 usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
1345 usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
1346@@ -25,6 +16,7 @@
1347 usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
1348 usr/include/*/qt5/UbuntuGestures/touchregistry.h
1349 usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
1350+usr/include/*/qt5/UbuntuGestures/ubuntugesturesmodule.h
1351 usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
1352 usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
1353 usr/lib/*/libUbuntuGestures.la
1354
1355=== modified file 'debian/libubuntutoolkit5-dev.install'
1356--- debian/libubuntutoolkit5-dev.install 2016-06-02 12:50:02 +0000
1357+++ debian/libubuntutoolkit5-dev.install 2016-06-22 15:52:01 +0000
1358@@ -1,18 +1,82 @@
1359-usr/include/*/qt5/UbuntuToolkit/AsyncLoader
1360-usr/include/*/qt5/UbuntuToolkit/ColorUtils
1361-usr/include/*/qt5/UbuntuToolkit/MouseTouchAdaptor
1362-usr/include/*/qt5/UbuntuToolkit/PropertyChange
1363-usr/include/*/qt5/UbuntuToolkit/Tree
1364+usr/include/*/qt5/UbuntuToolkit/QQuickClipboard
1365 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
1366 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
1367+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitModule
1368 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
1369+usr/include/*/qt5/UbuntuToolkit/appheaderbase.h
1370 usr/include/*/qt5/UbuntuToolkit/asyncloader.h
1371 usr/include/*/qt5/UbuntuToolkit/colorutils.h
1372+usr/include/*/qt5/UbuntuToolkit/filterbehavior.h
1373+usr/include/*/qt5/UbuntuToolkit/frame.h
1374+usr/include/*/qt5/UbuntuToolkit/i18n.h
1375+usr/include/*/qt5/UbuntuToolkit/inversemouseareatype.h
1376+usr/include/*/qt5/UbuntuToolkit/listener.h
1377+usr/include/*/qt5/UbuntuToolkit/listitemdragarea.h
1378+usr/include/*/qt5/UbuntuToolkit/listitemdraghandler.h
1379+usr/include/*/qt5/UbuntuToolkit/listitemselection.h
1380+usr/include/*/qt5/UbuntuToolkit/listviewextensions.h
1381+usr/include/*/qt5/UbuntuToolkit/livetimer.h
1382 usr/include/*/qt5/UbuntuToolkit/mousetouchadaptor.h
1383 usr/include/*/qt5/UbuntuToolkit/propertychange.h
1384+usr/include/*/qt5/UbuntuToolkit/qquickclipboard.h
1385+usr/include/*/qt5/UbuntuToolkit/qquickmimedata.h
1386+usr/include/*/qt5/UbuntuToolkit/quickutils.h
1387+usr/include/*/qt5/UbuntuToolkit/sortbehavior.h
1388+usr/include/*/qt5/UbuntuToolkit/sortfiltermodel.h
1389+usr/include/*/qt5/UbuntuToolkit/textures.h
1390 usr/include/*/qt5/UbuntuToolkit/tree.h
1391 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
1392+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitmodule.h
1393 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
1394+usr/include/*/qt5/UbuntuToolkit/ucabstractbutton.h
1395+usr/include/*/qt5/UbuntuToolkit/ucaction.h
1396+usr/include/*/qt5/UbuntuToolkit/ucactioncontext.h
1397+usr/include/*/qt5/UbuntuToolkit/ucactionitem.h
1398+usr/include/*/qt5/UbuntuToolkit/ucactionmanager.h
1399+usr/include/*/qt5/UbuntuToolkit/ucalarm.h
1400+usr/include/*/qt5/UbuntuToolkit/ucalarmmodel.h
1401+usr/include/*/qt5/UbuntuToolkit/ucapplication.h
1402+usr/include/*/qt5/UbuntuToolkit/ucargument.h
1403+usr/include/*/qt5/UbuntuToolkit/ucarguments.h
1404+usr/include/*/qt5/UbuntuToolkit/ucbottomedge.h
1405+usr/include/*/qt5/UbuntuToolkit/ucbottomedgehint.h
1406+usr/include/*/qt5/UbuntuToolkit/ucbottomedgeregion.h
1407+usr/include/*/qt5/UbuntuToolkit/ucbottomedgestyle.h
1408+usr/include/*/qt5/UbuntuToolkit/ucdefaulttheme.h
1409+usr/include/*/qt5/UbuntuToolkit/ucdeprecatedtheme.h
1410+usr/include/*/qt5/UbuntuToolkit/ucfontutils.h
1411+usr/include/*/qt5/UbuntuToolkit/uchaptics.h
1412+usr/include/*/qt5/UbuntuToolkit/ucheader.h
1413+usr/include/*/qt5/UbuntuToolkit/ucinversemouse.h
1414+usr/include/*/qt5/UbuntuToolkit/uclabel.h
1415+usr/include/*/qt5/UbuntuToolkit/uclistitem.h
1416+usr/include/*/qt5/UbuntuToolkit/uclistitemactions.h
1417+usr/include/*/qt5/UbuntuToolkit/uclistitemlayout.h
1418+usr/include/*/qt5/UbuntuToolkit/uclistitemstyle.h
1419+usr/include/*/qt5/UbuntuToolkit/ucmainviewbase.h
1420+usr/include/*/qt5/UbuntuToolkit/ucmargins.h
1421+usr/include/*/qt5/UbuntuToolkit/ucmathutils.h
1422+usr/include/*/qt5/UbuntuToolkit/ucmouse.h
1423+usr/include/*/qt5/UbuntuToolkit/ucpagetreenode.h
1424+usr/include/*/qt5/UbuntuToolkit/ucpagewrapper.h
1425+usr/include/*/qt5/UbuntuToolkit/ucperformancemonitor.h
1426+usr/include/*/qt5/UbuntuToolkit/ucproportionalshape.h
1427+usr/include/*/qt5/UbuntuToolkit/ucqquickimageextension.h
1428+usr/include/*/qt5/UbuntuToolkit/ucscalingimageprovider.h
1429+usr/include/*/qt5/UbuntuToolkit/ucserviceproperties.h
1430+usr/include/*/qt5/UbuntuToolkit/ucslotslayout.h
1431+usr/include/*/qt5/UbuntuToolkit/ucstatesaver.h
1432+usr/include/*/qt5/UbuntuToolkit/ucstyleditembase.h
1433+usr/include/*/qt5/UbuntuToolkit/ucstylehints.h
1434+usr/include/*/qt5/UbuntuToolkit/uctheme.h
1435+usr/include/*/qt5/UbuntuToolkit/ucthemingextension.h
1436+usr/include/*/qt5/UbuntuToolkit/ucubuntuanimation.h
1437+usr/include/*/qt5/UbuntuToolkit/ucubuntushape.h
1438+usr/include/*/qt5/UbuntuToolkit/ucubuntushapeoverlay.h
1439+usr/include/*/qt5/UbuntuToolkit/ucubuntushapetextures.h
1440+usr/include/*/qt5/UbuntuToolkit/ucunits.h
1441+usr/include/*/qt5/UbuntuToolkit/ucurihandler.h
1442+usr/include/*/qt5/UbuntuToolkit/unitythemeiconprovider.h
1443 usr/lib/*/libUbuntuToolkit.la
1444 usr/lib/*/libUbuntuToolkit.prl
1445 usr/lib/*/libUbuntuToolkit.so
1446
1447=== modified file 'documentation/overview.qdoc'
1448--- documentation/overview.qdoc 2015-10-21 10:19:31 +0000
1449+++ documentation/overview.qdoc 2016-06-22 15:52:01 +0000
1450@@ -33,7 +33,7 @@
1451 \part Basic QML Types
1452 Available through:
1453 \code
1454- import Ubuntu.Components 1.2
1455+ import Ubuntu.Components 1.3
1456 \endcode
1457 \annotatedlist ubuntu
1458
1459@@ -51,7 +51,7 @@
1460
1461 Available through:
1462 \code
1463- import Ubuntu.Components 1.2
1464+ import Ubuntu.Components 1.3
1465 \endcode
1466 \annotatedlist ubuntu-listitem
1467
1468@@ -60,21 +60,21 @@
1469
1470 Available through:
1471 \code
1472- import Ubuntu.Components.ListItems 1.0
1473+ import Ubuntu.Components.ListItems 1.3
1474 \endcode
1475 \annotatedlist ubuntu-listitems
1476
1477 \part Pickers
1478 Available through:
1479 \code
1480- import Ubuntu.Components.Pickers 1.0
1481+ import Ubuntu.Components.Pickers 1.3
1482 \endcode
1483 \annotatedlist ubuntu-pickers
1484
1485 \part Popovers, Sheets and Dialogs
1486 Available through:
1487 \code
1488- import Ubuntu.Components.Popups 1.0
1489+ import Ubuntu.Components.Popups 1.3
1490 \endcode
1491 \annotatedlist ubuntu-popups
1492
1493@@ -88,14 +88,14 @@
1494 \part Theming Elements
1495 Available through:
1496 \code
1497- import Ubuntu.Components 1.2
1498+ import Ubuntu.Components 1.3
1499 \endcode
1500 \annotatedlist theming
1501
1502 \part Theme module
1503 Available through:
1504 \code
1505- import Ubuntu.Components.Themes 1.0
1506+ import Ubuntu.Components.Themes 1.3
1507 \endcode
1508 \annotatedlist theme-module
1509
1510@@ -104,28 +104,28 @@
1511 Themes must make sure that these interfaces are all implemented.
1512 Available through:
1513 \code
1514- import Ubuntu.Components.Styles 1.2
1515+ import Ubuntu.Components.Styles 1.3
1516 \endcode
1517 \annotatedlist style-api
1518
1519 \part Resolution Independence Items
1520 Available through:
1521 \code
1522- import Ubuntu.Components 1.2
1523+ import Ubuntu.Components 1.3
1524 \endcode
1525 \annotatedlist resolution-independence
1526
1527 \part Parsing Command-Line Arguments
1528 Available through:
1529 \code
1530- import Ubuntu.Components 1.2
1531+ import Ubuntu.Components 1.3
1532 \endcode
1533 \annotatedlist ubuntu-commandline
1534
1535 \part Services
1536 Available through:
1537 \code
1538- import Ubuntu.Components 1.2
1539+ import Ubuntu.Components 1.3
1540 \endcode
1541 \annotatedlist ubuntu-services
1542
1543@@ -139,7 +139,7 @@
1544 \part Test extensions
1545 Available through:
1546 \code
1547- import Ubuntu Test 1.0
1548+ import Ubuntu Test 1.3
1549 \endcode
1550 \annotatedlist ubuntu-test
1551 */
1552
1553=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
1554--- documentation/ubuntu-ui-toolkit-common.qdocconf 2016-01-07 15:00:13 +0000
1555+++ documentation/ubuntu-ui-toolkit-common.qdocconf 2016-06-22 15:52:01 +0000
1556@@ -1,9 +1,15 @@
1557 project = UbuntuUserInterfaceToolkit
1558 url = http://developer.ubuntu.com/api/ubuntu-15.04/qml/mobile/
1559 description = Ubuntu User Interface Toolkit Documentation
1560+defines = Q_QDOC
1561 sourcedirs = ./
1562+headerdirs = ../include
1563 sourcedirs += ../src/Ubuntu/Components
1564-headerdirs = ../src/Ubuntu/Components/plugin
1565+headerdirs += ../src/Ubuntu/Components/plugin
1566+sourcedirs += ../src/Ubuntu/UbuntuToolkit
1567+headerdirs += ../src/Ubuntu/UbuntuToolkit
1568+sourcedirs += ../src/Ubuntu/UbuntuGestures
1569+headerdirs += ../src/Ubuntu/UbuntuGestures
1570 sourcedirs += ../src/Ubuntu/Layouts
1571 headerdirs += ../src/Ubuntu/Layouts/plugin
1572 sourcedirs += ../src/Ubuntu/PerformanceMetrics
1573@@ -27,6 +33,7 @@
1574 headers.fileextensions = "*.h"
1575 # exclude qml files that have the component documented in a separate qdoc file
1576 excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
1577+excludefiles += ../src/Ubuntu/UbuntuToolkit/asyncloader.cpp
1578 outputdir = $BLD/html
1579 outputformats = HTML
1580 version = 1.3
1581
1582=== modified file 'features/ubuntu_qml_plugin.prf'
1583--- features/ubuntu_qml_plugin.prf 2016-04-05 06:28:06 +0000
1584+++ features/ubuntu_qml_plugin.prf 2016-06-22 15:52:01 +0000
1585@@ -84,4 +84,5 @@
1586
1587 #do not warn for deprecated declarations
1588 QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
1589+DEFINES -= QT_DEPRECATED_WARNINGS
1590
1591
1592=== modified file 'features/ubuntu_qt_module.prf'
1593--- features/ubuntu_qt_module.prf 2015-11-29 15:31:53 +0000
1594+++ features/ubuntu_qt_module.prf 2016-06-22 15:52:01 +0000
1595@@ -20,3 +20,4 @@
1596
1597 #do not warn for deprecated declarations
1598 QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
1599+DEFINES -= QT_DEPRECATED_WARNINGS
1600
1601=== removed directory 'src/Ubuntu/Components/plugin/gestures'
1602=== removed file 'src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp'
1603--- src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp 2015-10-21 07:34:54 +0000
1604+++ src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp 1970-01-01 00:00:00 +0000
1605@@ -1,46 +0,0 @@
1606-/*
1607- * Copyright (C) 2015 Canonical, Ltd.
1608- *
1609- * This program is free software; you can redistribute it and/or modify
1610- * it under the terms of the GNU General Public License as published by
1611- * the Free Software Foundation; version 3.
1612- *
1613- * This program is distributed in the hope that it will be useful,
1614- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1615- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1616- * GNU General Public License for more details.
1617- *
1618- * You should have received a copy of the GNU General Public License
1619- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1620- */
1621-
1622-#include "CandidateInactivityTimer.h"
1623-
1624-namespace UbuntuGestures {
1625-
1626-CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
1627- AbstractTimer *timer, QObject *parent)
1628- : QObject(parent)
1629- , m_timer(timer)
1630- , m_touchId(touchId)
1631- , m_candidate(candidate)
1632-{
1633- connect(m_timer, &AbstractTimer::timeout,
1634- this, &CandidateInactivityTimer::onTimeout);
1635- m_timer->setInterval(durationMs);
1636- m_timer->setSingleShot(true);
1637- m_timer->start();
1638-}
1639-
1640-CandidateInactivityTimer::~CandidateInactivityTimer()
1641-{
1642- delete m_timer;
1643-}
1644-
1645-void CandidateInactivityTimer::onTimeout()
1646-{
1647- qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);
1648- Q_EMIT candidateDefaulted(m_touchId, m_candidate);
1649-}
1650-
1651-} // namespace UbuntuGestures
1652
1653=== removed file 'src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h'
1654--- src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h 2015-10-21 07:34:54 +0000
1655+++ src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h 1970-01-01 00:00:00 +0000
1656@@ -1,52 +0,0 @@
1657-/*
1658- * Copyright 2015 Canonical Ltd.
1659- *
1660- * This program is free software; you can redistribute it and/or modify
1661- * it under the terms of the GNU Lesser General Public License as published by
1662- * the Free Software Foundation; version 3.
1663- *
1664- * This program is distributed in the hope that it will be useful,
1665- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1666- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1667- * GNU Lesser General Public License for more details.
1668- *
1669- * You should have received a copy of the GNU Lesser General Public License
1670- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1671- *
1672- */
1673-
1674-#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
1675-#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
1676-
1677-#include <QtCore/QObject>
1678-
1679-class QQuickItem;
1680-
1681-#include "Timer.h"
1682-
1683-namespace UbuntuGestures {
1684-
1685-class UBUNTUGESTURESQML_EXPORT CandidateInactivityTimer : public QObject {
1686- Q_OBJECT
1687-public:
1688- CandidateInactivityTimer(int touchId, QQuickItem *candidate,
1689- AbstractTimer *timer,
1690- QObject *parent = Q_NULLPTR);
1691-
1692- virtual ~CandidateInactivityTimer();
1693-
1694- const int durationMs = 1000;
1695-
1696-Q_SIGNALS:
1697- void candidateDefaulted(int touchId, QQuickItem *candidate);
1698-private Q_SLOTS:
1699- void onTimeout();
1700-private:
1701- AbstractTimer *m_timer;
1702- int m_touchId;
1703- QQuickItem *m_candidate;
1704-};
1705-
1706-} // namespace UbuntuGestures
1707-
1708-#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
1709
1710=== removed file 'src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h'
1711--- src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h 2015-10-21 07:34:54 +0000
1712+++ src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h 1970-01-01 00:00:00 +0000
1713@@ -1,24 +0,0 @@
1714-/*
1715- * Copyright 2015 Canonical Ltd.
1716- *
1717- * This program is free software; you can redistribute it and/or modify
1718- * it under the terms of the GNU Lesser General Public License as published by
1719- * the Free Software Foundation; version 3.
1720- *
1721- * This program is distributed in the hope that it will be useful,
1722- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1723- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1724- * GNU Lesser General Public License for more details.
1725- *
1726- * You should have received a copy of the GNU Lesser General Public License
1727- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1728- *
1729- */
1730-
1731-#include <QtCore/QtGlobal>
1732-
1733-#if defined(UBUNTUGESTURESQML_LIBRARY)
1734-# define UBUNTUGESTURESQML_EXPORT Q_DECL_EXPORT
1735-#else
1736-# define UBUNTUGESTURESQML_EXPORT Q_DECL_IMPORT
1737-#endif
1738
1739=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
1740--- src/Ubuntu/Components/plugin/plugin.cpp 2016-04-20 15:00:27 +0000
1741+++ src/Ubuntu/Components/plugin/plugin.cpp 2016-06-22 15:52:01 +0000
1742@@ -15,316 +15,32 @@
1743 *
1744 */
1745
1746-#include <QtQuick/private/qquickimagebase_p.h>
1747-#include <QDBusConnection>
1748-#include <QtGui/QGuiApplication>
1749-#include <QtGui/QScreen>
1750-
1751+#include <QtQml/QQmlEngine>
1752 #include "plugin.h"
1753-#include "uctheme.h"
1754-#include "ucdeprecatedtheme.h"
1755-#include "ucthemingextension.h"
1756-
1757-#include <QtQml/QQmlContext>
1758-#include "i18n.h"
1759-#include "listener.h"
1760-#include "livetimer.h"
1761-#include "ucunits.h"
1762-#include "ucscalingimageprovider.h"
1763-#include "ucqquickimageextension.h"
1764-#include "quickutils.h"
1765-#include "ucubuntushape.h"
1766-#include "ucubuntushapeoverlay.h"
1767-#include "ucproportionalshape.h"
1768-#include "inversemouseareatype.h"
1769-#include "qquickclipboard.h"
1770-#include "qquickmimedata.h"
1771-#include "ucubuntuanimation.h"
1772-#include "ucfontutils.h"
1773-#include "ucarguments.h"
1774-#include "ucargument.h"
1775-#include "ucapplication.h"
1776-#include "ucalarm.h"
1777-#include "ucalarmmodel.h"
1778-#include "unitythemeiconprovider.h"
1779-#include "ucstatesaver.h"
1780-#include "ucurihandler.h"
1781-#include "ucmouse.h"
1782-#include "ucinversemouse.h"
1783-#include "sortfiltermodel.h"
1784-#include "ucstyleditembase.h"
1785-#include "ucstylehints.h"
1786-#include "ucaction.h"
1787-#include "ucactioncontext.h"
1788-#include "ucactionmanager.h"
1789-#include "uclistitem.h"
1790-#include "uclistitem_p.h"
1791-#include "uclistitemactions.h"
1792-#include "uclistitemstyle.h"
1793-#include "ucserviceproperties.h"
1794 #include "ucnamespace.h"
1795-#include "ucslotslayout.h"
1796-#include "ucactionitem.h"
1797-#include "uchaptics.h"
1798-#include "ucabstractbutton.h"
1799-#include "ucheader.h"
1800-#include "uclabel.h"
1801-#include "uclistitemlayout.h"
1802-#include "ucbottomedgehint.h"
1803-#include "ucmathutils.h"
1804-#include "ucbottomedge.h"
1805-#include "ucbottomedgeregion.h"
1806-#include "ucbottomedgestyle.h"
1807-#include "ucpagetreenode.h"
1808-#include "ucmainviewbase.h"
1809-#include "ucperformancemonitor.h"
1810-#include "privates/frame.h"
1811-#include "privates/ucpagewrapper.h"
1812-#include "privates/appheaderbase.h"
1813-
1814-// From UbuntuGestures
1815-#include "private/ucswipearea_p.h"
1816-
1817-//From UbuntuToolkit
1818-#include <ColorUtils>
1819-#include <Tree>
1820-
1821-#include <sys/types.h>
1822-#include <unistd.h>
1823-#include <stdexcept>
1824-
1825-QUrl UbuntuComponentsPlugin::m_baseUrl = QUrl();
1826-
1827-/*
1828- * Type registration functions.
1829- */
1830-
1831-template<typename T> static QObject *qmlRegisterSimpleSingletonTypeCallback(QQmlEngine *, QJSEngine *)
1832-{
1833- return (new T);
1834-}
1835-
1836-template<typename T> static int qmlRegisterSimpleSingletonType(const char *uri, int major, int minor, const char *typeName)
1837-{
1838- return qmlRegisterSingletonType<T>(uri, major, minor, typeName, qmlRegisterSimpleSingletonTypeCallback<T>);
1839-}
1840-
1841-void UbuntuComponentsPlugin::initializeBaseUrl()
1842-{
1843- if (!m_baseUrl.isValid()) {
1844- m_baseUrl = QUrl(baseUrl().toString() + '/');
1845- }
1846-}
1847-
1848-void UbuntuComponentsPlugin::registerWindowContextProperty()
1849-{
1850- setWindowContextProperty(QGuiApplication::focusWindow());
1851-
1852- // listen to QGuiApplication::focusWindowChanged
1853- /* Ensure that setWindowContextProperty is called in the same thread (the
1854- main thread) otherwise it segfaults. Reference:
1855- https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205556
1856- */
1857- QGuiApplication* application = static_cast<QGuiApplication*>(QCoreApplication::instance());
1858- QObject::connect(application, SIGNAL(focusWindowChanged(QWindow*)),
1859- this, SLOT(setWindowContextProperty(QWindow*)),
1860- Qt::ConnectionType(Qt::DirectConnection | Qt::UniqueConnection));
1861-
1862-}
1863-
1864-void UbuntuComponentsPlugin::setWindowContextProperty(QWindow* focusWindow)
1865-{
1866- QQuickView* view = qobject_cast<QQuickView*>(focusWindow);
1867-
1868- if (view != NULL) {
1869- view->rootContext()->setContextProperty("window", view);
1870- }
1871-}
1872-
1873-void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor)
1874-{
1875- qmlRegisterType<UCAction>(uri, major, minor, "Action");
1876- qmlRegisterType<UCActionContext>(uri, major, minor, "ActionContext");
1877- qmlRegisterUncreatableType<UCApplication>(uri, major, minor, "UCApplication", "Not instantiable");
1878- qmlRegisterType<UCActionManager>(uri, major, minor, "ActionManager");
1879- qmlRegisterUncreatableType<UCFontUtils>(uri, major, minor, "UCFontUtils", "Not instantiable");
1880- qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItem");
1881- qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
1882- qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
1883- qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
1884- qmlRegisterType<UCUbuntuShape>(uri, major, minor, "UbuntuShape");
1885- // FIXME/DEPRECATED: Shape is exported for backwards compatibility only
1886- qmlRegisterType<UCUbuntuShape>(uri, major, minor, "Shape");
1887- qmlRegisterType<InverseMouseAreaType>(uri, major, minor, "InverseMouseArea");
1888- qmlRegisterType<QQuickMimeData>(uri, major, minor, "MimeData");
1889- qmlRegisterSimpleSingletonType<QQuickClipboard>(uri, major, minor, "Clipboard");
1890- qmlRegisterSimpleSingletonType<UCUbuntuAnimation>(uri, major, minor, "UbuntuAnimation");
1891- qmlRegisterType<UCArguments>(uri, major, minor, "Arguments");
1892- qmlRegisterType<UCArgument>(uri, major, minor, "Argument");
1893- qmlRegisterType<QQmlPropertyMap>();
1894- qmlRegisterType<UCAlarm>(uri, major, minor, "Alarm");
1895- qmlRegisterType<UCAlarmModel>(uri, major, minor, "AlarmModel");
1896- qmlRegisterType<UCStateSaver>(uri, major, minor, "StateSaver");
1897- qmlRegisterType<UCStateSaverAttached>();
1898- qmlRegisterSimpleSingletonType<UCUriHandler>(uri, major, minor, "UriHandler");
1899- qmlRegisterType<UCMouse>(uri, major, minor, "Mouse");
1900- qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
1901- qmlRegisterType<UCActionItem>(uri, major, minor, "ActionItem");
1902- qmlRegisterSimpleSingletonType<UCHaptics>(uri, major, minor, "Haptics");
1903- qmlRegisterSimpleSingletonType<UCMathUtils>(uri, major, minor, "MathUtils");
1904- qmlRegisterSimpleSingletonType<UbuntuToolkit::ColorUtils>(uri, major, minor, "ColorUtils");
1905+#include <ubuntutoolkitmodule.h>
1906+#include <ubuntugesturesmodule.h>
1907+
1908+UbuntuComponentsPlugin::~UbuntuComponentsPlugin()
1909+{
1910+ UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::undefineModule();
1911+ UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::undefineModule();
1912 }
1913
1914 void UbuntuComponentsPlugin::registerTypes(const char *uri)
1915 {
1916 Q_ASSERT(uri == QLatin1String("Ubuntu.Components"));
1917- initializeBaseUrl();
1918-
1919- // register 0.1 for backward compatibility
1920- registerTypesToVersion(uri, 0, 1);
1921- registerTypesToVersion(uri, 1, 0);
1922-
1923- // register custom event
1924- ForwardedEvent::registerForwardedEvent();
1925-
1926- // register parent type so that properties can get/ set it
1927- qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "QAbstractItemModel", "Not instantiable");
1928-
1929- // register 1.1 only API
1930- qmlRegisterType<UCStyledItemBase, 1>(uri, 1, 1, "StyledItem");
1931- qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
1932- qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
1933- qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
1934- qmlRegisterType<UCServiceProperties, 1>(uri, 1, 1, "ServiceProperties");
1935-
1936- // register 1.2 only API
1937- qmlRegisterType<UCListItem>(uri, 1, 2, "ListItem");
1938- qmlRegisterType<UCListItemDivider>();
1939- qmlRegisterUncreatableType<UCSwipeEvent>(uri, 1, 2, "SwipeEvent", "This is an event object.");
1940- qmlRegisterUncreatableType<UCDragEvent>(uri, 1, 2, "ListItemDrag", "This is an event object");
1941- qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions");
1942- qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable");
1943- qmlRegisterSimpleSingletonType<UCNamespace>(uri, 1, 2, "Ubuntu");
1944- qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape");
1945- qmlRegisterType<UCUbuntuShapeOverlay>(uri, 1, 2, "UbuntuShapeOverlay");
1946-
1947- // register 1.3 API
1948- qmlRegisterType<UCListItem, 1>(uri, 1, 3, "ListItem");
1949- qmlRegisterType<UCListItemExpansion>();
1950- qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
1951- qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
1952- qmlRegisterSimpleSingletonType<UCNamespaceV13>(uri, 1, 3, "Ubuntu");
1953- qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
1954- qmlRegisterCustomType<UCStyleHints>(uri, 1, 3, "StyleHints", new UCStyleHintsParser);
1955- qmlRegisterType<UCAction, 1>(uri, 1, 3, "Action");
1956- qmlRegisterType<UCSlotsLayout>(uri, 1, 3, "SlotsLayout");
1957- qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
1958- qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
1959- qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
1960- qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
1961- qmlRegisterType<UCMargins>();
1962- qmlRegisterUncreatableType<UCSlotsAttached>(uri, 1, 3, "SlotsAttached", "Not instantiable");
1963- qmlRegisterUncreatableType<UCSlotsLayoutPadding>(uri, 1, 3, "SlotsLayoutPadding", "Not instantiable");
1964- qmlRegisterType<UCListItemLayout>(uri, 1, 3, "ListItemLayout");
1965- qmlRegisterType<UCHeader>(uri, 1, 3, "Header");
1966- qmlRegisterType<UCLabel>(uri, 1, 3, "Label");
1967- qmlRegisterType<UCBottomEdgeHint>(uri, 1, 3, "BottomEdgeHint");
1968- qmlRegisterType<UCSwipeArea>(uri, 1, 3, "SwipeArea");
1969- qmlRegisterType<UCBottomEdge>(uri, 1, 3, "BottomEdge");
1970- qmlRegisterType<UCBottomEdgeRegion>(uri, 1, 3, "BottomEdgeRegion");
1971- qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
1972- qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
1973- qmlRegisterType<UCMainViewBase>(uri, 1, 3, "MainViewBase");
1974-}
1975-
1976-void UbuntuComponentsPlugin::initializeContextProperties(QQmlEngine *engine)
1977-{
1978- UCUnits::instance(engine);
1979- QuickUtils::instance(engine);
1980- UbuntuI18n::instance(engine);
1981- UCApplication::instance(engine);
1982- UCFontUtils::instance(engine);
1983- UCTheme::defaultTheme(engine);
1984-
1985- QQmlContext* context = engine->rootContext();
1986-
1987- // register root object watcher that sets a global property with the root object
1988- // that can be accessed from any object
1989- context->setContextProperty("QuickUtils", QuickUtils::instance());
1990-
1991- UCDeprecatedTheme::registerToContext(context);
1992-
1993- context->setContextProperty("i18n", UbuntuI18n::instance());
1994- ContextPropertyChangeListener *i18nChangeListener =
1995- new ContextPropertyChangeListener(context, "i18n");
1996- QObject::connect(UbuntuI18n::instance(), SIGNAL(domainChanged()),
1997- i18nChangeListener, SLOT(updateContextProperty()));
1998- QObject::connect(UbuntuI18n::instance(), SIGNAL(languageChanged()),
1999- i18nChangeListener, SLOT(updateContextProperty()));
2000-
2001- // We can't use 'Application' because it exists (undocumented)
2002- context->setContextProperty("UbuntuApplication", UCApplication::instance());
2003- ContextPropertyChangeListener *applicationChangeListener =
2004- new ContextPropertyChangeListener(context, "UbuntuApplication");
2005- QObject::connect(UCApplication::instance(), SIGNAL(applicationNameChanged()),
2006- applicationChangeListener, SLOT(updateContextProperty()));
2007- // Give the application object access to the engine
2008- UCApplication::instance()->setContext(context);
2009-
2010- context->setContextProperty("units", UCUnits::instance());
2011- ContextPropertyChangeListener *unitsChangeListener =
2012- new ContextPropertyChangeListener(context, "units");
2013- QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
2014- unitsChangeListener, SLOT(updateContextProperty()));
2015-
2016- // register FontUtils
2017- context->setContextProperty("FontUtils", UCFontUtils::instance());
2018- ContextPropertyChangeListener *fontUtilsListener =
2019- new ContextPropertyChangeListener(context, "FontUtils");
2020- QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
2021- fontUtilsListener, SLOT(updateContextProperty()));
2022-
2023+ Q_UNUSED(uri);
2024+
2025+ qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespace>(uri, 1, 2, "Ubuntu");
2026+ qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespaceV13>(uri, 1, 3, "Ubuntu");
2027+
2028+ UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::defineModule(uri);
2029+ UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::defineModule();
2030 }
2031
2032 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
2033 {
2034- // initialize baseURL
2035- initializeBaseUrl();
2036-
2037- // register internal styles
2038- const char *styleUri = "Ubuntu.Components.Styles";
2039- qmlRegisterType<UCListItemStyle>(styleUri, 1, 2, "ListItemStyle");
2040- qmlRegisterType<UCListItemStyle, 1>(styleUri, 1, 3, "ListItemStyle");
2041- qmlRegisterType<UCBottomEdgeStyle>(styleUri, 1, 3, "BottomEdgeStyle");
2042-
2043- // Register private types.
2044- const char *privateUri = "Ubuntu.Components.Private";
2045- qmlRegisterType<UCFrame>(privateUri, 1, 3, "Frame");
2046- qmlRegisterType<UCPageWrapper>(privateUri, 1, 3, "PageWrapper");
2047- qmlRegisterType<UCAppHeaderBase>(privateUri, 1, 3, "AppHeaderBase");
2048- qmlRegisterType<UbuntuToolkit::Tree>(privateUri, 1, 3, "Tree");
2049-
2050+ UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::initializeModule(engine, baseUrl());
2051 QQmlExtensionPlugin::initializeEngine(engine, uri);
2052-
2053- // allocate all context property objects prior we register them
2054- initializeContextProperties(engine);
2055-
2056- HapticsProxy::instance(engine);
2057-
2058- engine->addImageProvider(QLatin1String("scaling"), new UCScalingImageProvider);
2059-
2060- // register icon provider
2061- engine->addImageProvider(QLatin1String("theme"), new UnityThemeIconProvider);
2062-
2063- // Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
2064- QGuiApplication::primaryScreen()->setOrientationUpdateMask(
2065- Qt::PortraitOrientation |
2066- Qt::LandscapeOrientation |
2067- Qt::InvertedPortraitOrientation |
2068- Qt::InvertedLandscapeOrientation);
2069-
2070- registerWindowContextProperty();
2071-
2072- // register performance monitor
2073- engine->rootContext()->setContextProperty("performanceMonitor", new UCPerformanceMonitor(engine));
2074 }
2075
2076=== modified file 'src/Ubuntu/Components/plugin/plugin.h'
2077--- src/Ubuntu/Components/plugin/plugin.h 2016-04-28 11:19:46 +0000
2078+++ src/Ubuntu/Components/plugin/plugin.h 2016-06-22 15:52:01 +0000
2079@@ -21,8 +21,7 @@
2080
2081 #include <QtQml/QQmlEngine>
2082 #include <QtQml/QQmlExtensionPlugin>
2083-
2084-class QWindow;
2085+#include <ubuntutoolkitglobal.h>
2086
2087 class UbuntuComponentsPlugin : public QQmlExtensionPlugin
2088 {
2089@@ -30,22 +29,10 @@
2090 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2091
2092 public:
2093+ ~UbuntuComponentsPlugin();
2094 void registerTypes(const char *uri) override;
2095 void initializeEngine(QQmlEngine *engine, const char *uri) override;
2096- static const QUrl &pluginUrl()
2097- {
2098- return m_baseUrl;
2099- }
2100- static void initializeContextProperties(QQmlEngine*);
2101-
2102-private Q_SLOTS:
2103- void registerWindowContextProperty();
2104- void setWindowContextProperty(QWindow* focusWindow);
2105-
2106-private:
2107- static QUrl m_baseUrl;
2108- void initializeBaseUrl();
2109- void registerTypesToVersion(const char *uri, int major, int minor);
2110+
2111 };
2112+
2113 #endif // UBUNTU_COMPONENTS_PLUGIN_H
2114-
2115
2116=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
2117--- src/Ubuntu/Components/plugin/plugin.pri 2016-06-16 09:50:36 +0000
2118+++ src/Ubuntu/Components/plugin/plugin.pri 2016-06-22 15:52:01 +0000
2119@@ -1,9 +1,5 @@
2120-unix {
2121- CONFIG += link_pkgconfig
2122- PKGCONFIG += gio-2.0 dbus-1 libnih-dbus
2123-}
2124-
2125-QT *= core-private qml qml-private quick quick-private gui-private dbus svg UbuntuGestures UbuntuGestures_private UbuntuToolkit
2126+QT *= core-private qml qml-private quick quick-private gui-private dbus svg \
2127+ UbuntuGestures UbuntuGestures_private UbuntuToolkit UbuntuToolkit_private
2128
2129 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
2130 QT += v8-private
2131@@ -11,202 +7,10 @@
2132
2133 CONFIG += no_keywords c++11
2134
2135-# QOrganizer
2136-QT *= organizer
2137-
2138-#comment in the following line to disable traces
2139-#DEFINES += QT_NO_DEBUG_OUTPUT
2140-DEFINES += QT_USE_QSTRINGBUILDER
2141-
2142 INCLUDEPATH+=$$PWD
2143
2144 HEADERS += $$PWD/plugin.h \
2145- $$PWD/uctheme.h \
2146- $$PWD/i18n.h \
2147- $$PWD/listener.h \
2148- $$PWD/ucscalingimageprovider.h \
2149- $$PWD/ucunits.h \
2150- $$PWD/ucqquickimageextension.h \
2151- $$PWD/quickutils.h \
2152- $$PWD/ucubuntushapetextures.h \
2153- $$PWD/ucubuntushape.h \
2154- $$PWD/ucubuntushapeoverlay.h \
2155- $$PWD/ucproportionalshape.h \
2156- $$PWD/inversemouseareatype.h \
2157- $$PWD/qquickclipboard.h \
2158- $$PWD/qquickmimedata.h \
2159- $$PWD/qquickclipboard_p.h \
2160- $$PWD/ucubuntuanimation.h \
2161- $$PWD/ucfontutils.h \
2162- $$PWD/ucapplication.h \
2163- $$PWD/ucarguments.h \
2164- $$PWD/ucargument.h \
2165- $$PWD/ucalarm.h \
2166- $$PWD/ucalarm_p.h \
2167- $$PWD/alarmmanager_p_p.h \
2168- $$PWD/alarmmanager_p.h \
2169- $$PWD/ucalarmmodel.h \
2170- $$PWD/unitythemeiconprovider.h \
2171- $$PWD/adapters/alarmsadapter_p.h \
2172- $$PWD/ucstatesaver.h \
2173- $$PWD/sortbehavior.h \
2174- $$PWD/filterbehavior.h \
2175- $$PWD/sortfiltermodel.h \
2176- $$PWD/statesaverbackend_p.h \
2177- $$PWD/ucstatesaver_p.h \
2178- $$PWD/ucurihandler.h \
2179- $$PWD/ucinversemouse.h \
2180- $$PWD/ucmouse.h \
2181- $$PWD/unixsignalhandler_p.h \
2182- $$PWD/ucstyleditembase.h \
2183- $$PWD/ucstyleditembase_p.h \
2184- $$PWD/ucaction.h \
2185- $$PWD/ucactioncontext.h \
2186- $$PWD/ucactionmanager.h \
2187- $$PWD/adapters/actionsproxy_p.h \
2188- $$PWD/adapters/dbuspropertywatcher_p.h \
2189- $$PWD/uclistitem.h \
2190- $$PWD/uclistitem_p.h \
2191- $$PWD/uclistitemactions.h \
2192- $$PWD/uclistitemactions_p.h \
2193- $$PWD/uclistitemstyle.h \
2194- $$PWD/ucserviceproperties.h \
2195- $$PWD/ucserviceproperties_p.h \
2196- $$PWD/privates/listitemdragarea.h \
2197- $$PWD/privates/listitemdraghandler.h \
2198- $$PWD/privates/listitemselection.h \
2199- $$PWD/ucnamespace.h \
2200- $$PWD/ucdeprecatedtheme.h \
2201- $$PWD/ucdefaulttheme.h \
2202- $$PWD/ucstylehints.h \
2203- $$PWD/ucslotslayout.h \
2204- $$PWD/ucslotslayout_p.h \
2205- $$PWD/livetimer.h \
2206- $$PWD/livetimer_p.h \
2207- $$PWD/timeutils_p.h \
2208- $$PWD/ucactionitem.h \
2209- $$PWD/ucactionitem_p.h \
2210- $$PWD/uchaptics.h \
2211- $$PWD/ucabstractbutton.h \
2212- $$PWD/ucabstractbutton_p.h \
2213- $$PWD/ucmargins.h \
2214- $$PWD/ucthemingextension.h \
2215- $$PWD/ucheader.h \
2216- $$PWD/uclabel.h \
2217- $$PWD/uclistitemlayout.h \
2218- $$PWD/privates/threelabelsslot_p.h \
2219- $$PWD/ucimportversionchecker_p.h \
2220- $$PWD/ucbottomedgehint.h \
2221- $$PWD/ucbottomedgehint_p.h \
2222- $$PWD/gestures/ubuntugesturesqmlglobal.h \
2223- $$PWD/ucmathutils.h \
2224- $$PWD/ucbottomedge.h \
2225- $$PWD/ucbottomedge_p.h \
2226- $$PWD/ucbottomedgestyle.h \
2227- $$PWD/ucbottomedgeregion.h \
2228- $$PWD/ucpagetreenode.h \
2229- $$PWD/ucpagetreenode_p.h \
2230- $$PWD/ucmainviewbase.h \
2231- $$PWD/ucmainviewbase_p.h \
2232- $$PWD/ucperformancemonitor.h \
2233- $$PWD/privates/listviewextensions.h \
2234- $$PWD/privates/frame.h \
2235- $$PWD/privates/ucpagewrapper.h \
2236- $$PWD/privates/ucpagewrapper_p.h \
2237- $$PWD/privates/ucpagewrapperincubator_p.h \
2238- $$PWD/privates/appheaderbase.h \
2239- $$PWD/label_p.h \
2240- $$PWD/ucbottomedgeregion_p.h
2241+ $$PWD/ucnamespace.h
2242
2243 SOURCES += $$PWD/plugin.cpp \
2244- $$PWD/uctheme.cpp \
2245- $$PWD/i18n.cpp \
2246- $$PWD/listener.cpp \
2247- $$PWD/ucscalingimageprovider.cpp \
2248- $$PWD/ucunits.cpp \
2249- $$PWD/ucqquickimageextension.cpp \
2250- $$PWD/quickutils.cpp \
2251- $$PWD/ucubuntushapetextures.cpp \
2252- $$PWD/ucubuntushape.cpp \
2253- $$PWD/ucubuntushapeoverlay.cpp \
2254- $$PWD/ucproportionalshape.cpp \
2255- $$PWD/inversemouseareatype.cpp \
2256- $$PWD/qquickclipboard.cpp \
2257- $$PWD/qquickmimedata.cpp \
2258- $$PWD/ucubuntuanimation.cpp \
2259- $$PWD/ucfontutils.cpp \
2260- $$PWD/ucapplication.cpp \
2261- $$PWD/ucarguments.cpp \
2262- $$PWD/ucargument.cpp \
2263- $$PWD/ucalarm.cpp \
2264- $$PWD/alarmmanager_p.cpp \
2265- $$PWD/ucalarmmodel.cpp \
2266- $$PWD/unitythemeiconprovider.cpp \
2267- $$PWD/ucstatesaver.cpp \
2268- $$PWD/sortbehavior.cpp \
2269- $$PWD/filterbehavior.cpp \
2270- $$PWD/sortfiltermodel.cpp \
2271- $$PWD/statesaverbackend_p.cpp \
2272- $$PWD/ucurihandler.cpp \
2273- $$PWD/ucmousefilters.cpp \
2274- $$PWD/unixsignalhandler_p.cpp \
2275- $$PWD/ucstyleditembase.cpp \
2276- $$PWD/ucaction.cpp \
2277- $$PWD/ucactioncontext.cpp \
2278- $$PWD/ucactionmanager.cpp \
2279- $$PWD/adapters/actionsproxy_p.cpp \
2280- $$PWD/adapters/dbuspropertywatcher_p.cpp \
2281- $$PWD/uclistitem.cpp \
2282- $$PWD/uclistitemactions.cpp \
2283- $$PWD/uclistitemstyle.cpp \
2284- $$PWD/ucviewitemsattached.cpp \
2285- $$PWD/ucserviceproperties.cpp \
2286- $$PWD/privates/listitemdragarea.cpp \
2287- $$PWD/privates/listitemdraghandler.cpp \
2288- $$PWD/privates/listitemexpansion.cpp \
2289- $$PWD/privates/listitemselection.cpp \
2290- $$PWD/ucnamespace.cpp \
2291- $$PWD/ucdeprecatedtheme.cpp \
2292- $$PWD/ucdefaulttheme.cpp \
2293- $$PWD/ucstylehints.cpp \
2294- $$PWD/ucslotslayout.cpp \
2295- $$PWD/livetimer.cpp \
2296- $$PWD/livetimer_p.cpp \
2297- $$PWD/ucactionitem.cpp \
2298- $$PWD/uchaptics.cpp \
2299- $$PWD/ucabstractbutton.cpp \
2300- $$PWD/ucthemingextension.cpp \
2301- $$PWD/ucheader.cpp \
2302- $$PWD/uclabel.cpp \
2303- $$PWD/uclistitemlayout.cpp \
2304- $$PWD/privates/threelabelsslot_p.cpp \
2305- $$PWD/ucimportversionchecker_p.cpp \
2306- $$PWD/ucbottomedgehint.cpp \
2307- $$PWD/ucmathutils.cpp \
2308- $$PWD/ucbottomedge.cpp \
2309- $$PWD/ucbottomedgestyle.cpp \
2310- $$PWD/ucbottomedgeregion.cpp \
2311- $$PWD/ucpagetreenode.cpp \
2312- $$PWD/ucmainviewbase.cpp \
2313- $$PWD/ucperformancemonitor.cpp \
2314- $$PWD/privates/listviewextensions.cpp \
2315- $$PWD/privates/frame.cpp \
2316- $$PWD/privates/ucpagewrapper.cpp \
2317- $$PWD/privates/ucpagewrapperincubator.cpp \
2318- $$PWD/privates/appheaderbase.cpp
2319-
2320-# adapters
2321-SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
2322-
2323-RESOURCES += \
2324- $$PWD/plugin.qrc
2325-
2326-OTHER_FILES += \
2327- $$PWD/shaders/shape.vert \
2328- $$PWD/shaders/shape.frag \
2329- $$PWD/shaders/shape_no_dfdy.frag \
2330- $$PWD/shaders/shapeoverlay.vert \
2331- $$PWD/shaders/shapeoverlay.frag \
2332- $$PWD/shaders/shapeoverlay_no_dfdy.frag \
2333- $$PWD/privates/shaders/frame.vert \
2334- $$PWD/privates/shaders/frame.frag
2335+ $$PWD/ucnamespace.cpp
2336
2337=== modified file 'src/Ubuntu/Components/plugin/ucnamespace.cpp'
2338--- src/Ubuntu/Components/plugin/ucnamespace.cpp 2016-05-25 12:48:10 +0000
2339+++ src/Ubuntu/Components/plugin/ucnamespace.cpp 2016-06-22 15:52:01 +0000
2340@@ -17,9 +17,10 @@
2341
2342 #include "ucnamespace.h"
2343
2344+UT_NAMESPACE_BEGIN
2345+
2346 /*!
2347 * \qmltype Ubuntu
2348- * \instantiates UCNamespace
2349 * \inqmlmodule Ubuntu.Components
2350 * \ingroup ubuntu
2351 * \since Ubuntu.Components 1.2
2352@@ -76,3 +77,5 @@
2353 {
2354 return BUILD_VERSION(major, minor);
2355 }
2356+
2357+UT_NAMESPACE_END
2358
2359=== modified file 'src/Ubuntu/Components/plugin/ucnamespace.h'
2360--- src/Ubuntu/Components/plugin/ucnamespace.h 2015-12-07 12:09:45 +0000
2361+++ src/Ubuntu/Components/plugin/ucnamespace.h 2016-06-22 15:52:01 +0000
2362@@ -19,12 +19,10 @@
2363 #define UCNAMESPACE_H
2364
2365 #include <QtCore/QObject>
2366-#include "quickutils.h"
2367+#include <quickutils.h>
2368+#include <ubuntutoolkitglobal.h>
2369
2370-#define BUILD_VERSION(major, minor) ((((major) & 0x00FF) << 8) | ((minor) & 0x00FF))
2371-#define LATEST_UITK_VERSION BUILD_VERSION(1, 3)
2372-#define MAJOR_VERSION(version) ((version) >> 8)
2373-#define MINOR_VERSION(version) ((version) & 0x00FF)
2374+UT_NAMESPACE_BEGIN
2375
2376 #define UC_QML_DEPRECATION_WARNING(msg) \
2377 { \
2378@@ -85,4 +83,6 @@
2379 quint16 m_toolkitVersion;
2380 };
2381
2382+UT_NAMESPACE_END
2383+
2384 #endif // UCNAMESPACE_H
2385
2386=== modified file 'src/Ubuntu/Test/plugin/testplugin.cpp'
2387--- src/Ubuntu/Test/plugin/testplugin.cpp 2016-04-04 10:16:08 +0000
2388+++ src/Ubuntu/Test/plugin/testplugin.cpp 2016-06-22 15:52:01 +0000
2389@@ -17,7 +17,9 @@
2390 #include "testplugin.h"
2391 #include <QtQml>
2392 #include "uctestextras.h"
2393-#include <MouseTouchAdaptor>
2394+#include <mousetouchadaptor.h>
2395+
2396+UT_USE_NAMESPACE
2397
2398 static QObject *registerExtras(QQmlEngine *engine, QJSEngine *scriptEngine)
2399 {
2400@@ -30,5 +32,5 @@
2401 void TestPlugin::registerTypes(const char *uri)
2402 {
2403 qmlRegisterSingletonType<UCTestExtras>(uri, 1, 0, "TestExtras", registerExtras);
2404- qmlRegisterSingletonType<UbuntuToolkit::MouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", UbuntuToolkit::MouseTouchAdaptor::registerQmlSingleton);
2405+ qmlRegisterSingletonType<MouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", MouseTouchAdaptor::registerQmlSingleton);
2406 }
2407
2408=== modified file 'src/Ubuntu/Test/plugin/uctestextras.cpp'
2409--- src/Ubuntu/Test/plugin/uctestextras.cpp 2016-04-04 10:16:08 +0000
2410+++ src/Ubuntu/Test/plugin/uctestextras.cpp 2016-06-22 15:52:01 +0000
2411@@ -23,7 +23,9 @@
2412 #include <qpa/qwindowsysteminterface.h>
2413 #include <private/qobject_p.h>
2414 #include <QSysInfo>
2415-#include <MouseTouchAdaptor>
2416+#include <mousetouchadaptor.h>
2417+
2418+UT_USE_NAMESPACE
2419
2420 const char *DEVICE_MISSING_MSG = "No touch device registered. Register one using registerTouchDevice() before using %1";
2421
2422@@ -118,7 +120,7 @@
2423 */
2424 void UCTestExtras::registerTouchDevice()
2425 {
2426- if (UbuntuToolkit::MouseTouchAdaptor::registerTouchDevice() && m_testExtras) {
2427+ if (MouseTouchAdaptor::registerTouchDevice() && m_testExtras) {
2428 Q_EMIT m_testExtras->touchDevicePresentChanged();
2429 }
2430 }
2431@@ -132,7 +134,7 @@
2432 void UCTestExtras::touchPress(int touchId, QQuickItem *item, const QPoint &point)
2433 {
2434 CHECK_TOUCH_DEVICE(touchId, item);
2435- QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).press(touchId, item->mapToScene(point).toPoint(), item->window());
2436+ QTest::touchEvent(item->window(), MouseTouchAdaptor::touchDevice()).press(touchId, item->mapToScene(point).toPoint(), item->window());
2437 }
2438 /*!
2439 * \qmlmethod TestExtras::touchRelease(touchId, item, point)
2440@@ -142,7 +144,7 @@
2441 void UCTestExtras::touchRelease(int touchId, QQuickItem *item, const QPoint &point)
2442 {
2443 CHECK_TOUCH_DEVICE(touchId, item);
2444- QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).release(touchId, item->mapToScene(point).toPoint(), item->window());
2445+ QTest::touchEvent(item->window(), MouseTouchAdaptor::touchDevice()).release(touchId, item->mapToScene(point).toPoint(), item->window());
2446 }
2447 /*!
2448 * \qmlmethod TestExtras::touchClick(touchId, item, point)
2449@@ -191,7 +193,7 @@
2450 void UCTestExtras::touchMove(int touchId, QQuickItem *item, const QPoint &point)
2451 {
2452 CHECK_TOUCH_DEVICE(touchId, item);
2453- QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).move(touchId, item->mapToScene(point).toPoint(), item->window());
2454+ QTest::touchEvent(item->window(), MouseTouchAdaptor::touchDevice()).move(touchId, item->mapToScene(point).toPoint(), item->window());
2455 }
2456 /*!
2457 * \qmlmethod TestExtras::touchDrag(touchId, item, from, delta, steps = 5)
2458@@ -367,13 +369,14 @@
2459
2460 void UCTestExtras::removeTimeConstraintsFromSwipeArea(QQuickItem *item)
2461 {
2462- UCSwipeArea *swipeArea = dynamic_cast<UCSwipeArea*>(item);
2463+ UG_PREPEND_NAMESPACE(UCSwipeArea) *swipeArea = dynamic_cast<UG_PREPEND_NAMESPACE(UCSwipeArea)*>(item);
2464 if (!swipeArea) {
2465 qWarning() << item << "is not a SwipeArea";
2466 return;
2467 }
2468
2469- UCSwipeAreaPrivate *priv = static_cast<UCSwipeAreaPrivate *>(QObjectPrivate::get(swipeArea));
2470+ UG_PREPEND_NAMESPACE(UCSwipeAreaPrivate) *priv =
2471+ static_cast<UG_PREPEND_NAMESPACE(UCSwipeAreaPrivate)*>(QObjectPrivate::get(swipeArea));
2472 priv->setMaxTime(60 * 60 * 1000);
2473 priv->setCompositionTime(0);
2474 }
2475
2476=== modified file 'src/Ubuntu/UbuntuGestures/UbuntuGestures.pro'
2477--- src/Ubuntu/UbuntuGestures/UbuntuGestures.pro 2016-01-20 16:10:54 +0000
2478+++ src/Ubuntu/UbuntuGestures/UbuntuGestures.pro 2016-06-22 15:52:01 +0000
2479@@ -24,6 +24,7 @@
2480 ucswipearea_p.h \
2481 ucswipearea_p_p.h \
2482 damper_p.h \
2483+ ubuntugesturesmodule.h
2484
2485
2486 SOURCES += candidateinactivitytimer.cpp \
2487@@ -34,5 +35,6 @@
2488 touchregistry.cpp \
2489 unownedtouchevent.cpp \
2490 ucswipearea.cpp \
2491- damper.cpp
2492+ damper.cpp \
2493+ ubuntugesturesmodule.cpp
2494
2495
2496=== modified file 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp'
2497--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp 2015-11-09 08:31:43 +0000
2498+++ src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp 2016-06-22 15:52:01 +0000
2499@@ -16,7 +16,7 @@
2500
2501 #include "candidateinactivitytimer.h"
2502
2503-namespace UbuntuGestures {
2504+UG_NAMESPACE_BEGIN
2505
2506 CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
2507 AbstractTimer *timer, QObject *parent)
2508@@ -43,4 +43,4 @@
2509 Q_EMIT candidateDefaulted(m_touchId, m_candidate);
2510 }
2511
2512-} // namespace UbuntuGestures
2513+UG_NAMESPACE_END
2514
2515=== modified file 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h'
2516--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h 2015-11-09 08:38:28 +0000
2517+++ src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h 2016-06-22 15:52:01 +0000
2518@@ -23,7 +23,7 @@
2519
2520 #include "timer.h"
2521
2522-namespace UbuntuGestures {
2523+UG_NAMESPACE_BEGIN
2524
2525 class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
2526 Q_OBJECT
2527@@ -46,6 +46,6 @@
2528 QQuickItem *m_candidate;
2529 };
2530
2531-} // namespace UbuntuGestures
2532+UG_NAMESPACE_END
2533
2534 #endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
2535
2536=== modified file 'src/Ubuntu/UbuntuGestures/timer.cpp'
2537--- src/Ubuntu/UbuntuGestures/timer.cpp 2016-06-02 08:22:41 +0000
2538+++ src/Ubuntu/UbuntuGestures/timer.cpp 2016-06-22 15:52:01 +0000
2539@@ -16,7 +16,7 @@
2540
2541 #include "timer.h"
2542
2543-namespace UbuntuGestures {
2544+UG_NAMESPACE_BEGIN
2545
2546 Timer::Timer(QObject *parent) : AbstractTimer(parent)
2547 {
2548@@ -150,4 +150,4 @@
2549 return fakeTimer;
2550 }
2551
2552-} // namespace UbuntuGestures
2553+UG_NAMESPACE_END
2554
2555=== modified file 'src/Ubuntu/UbuntuGestures/timer.h'
2556--- src/Ubuntu/UbuntuGestures/timer.h 2015-11-17 12:02:40 +0000
2557+++ src/Ubuntu/UbuntuGestures/timer.h 2016-06-22 15:52:01 +0000
2558@@ -24,7 +24,7 @@
2559 #include <QPointer>
2560 #include <QTimer>
2561
2562-namespace UbuntuGestures {
2563+UG_NAMESPACE_BEGIN
2564
2565 /* Defines an interface for a Timer. */
2566 class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject
2567@@ -112,6 +112,6 @@
2568 QSharedPointer<FakeTimeSource> m_timeSource;
2569 };
2570
2571-} // namespace UbuntuGestures
2572+UG_NAMESPACE_END
2573
2574 #endif // UBUNTUGESTURES_TIMER_H
2575
2576=== modified file 'src/Ubuntu/UbuntuGestures/timesource.cpp'
2577--- src/Ubuntu/UbuntuGestures/timesource.cpp 2015-11-09 08:31:43 +0000
2578+++ src/Ubuntu/UbuntuGestures/timesource.cpp 2016-06-22 15:52:01 +0000
2579@@ -20,14 +20,12 @@
2580
2581 #include <QElapsedTimer>
2582
2583-namespace UbuntuGestures {
2584+UG_NAMESPACE_BEGIN
2585+
2586 class RealTimeSourcePrivate {
2587 public:
2588 QElapsedTimer timer;
2589 };
2590-}
2591-
2592-using namespace UbuntuGestures;
2593
2594 RealTimeSource::RealTimeSource()
2595 : UbuntuGestures::TimeSource()
2596@@ -45,3 +43,5 @@
2597 {
2598 return d->timer.elapsed();
2599 }
2600+
2601+UG_NAMESPACE_END
2602
2603=== modified file 'src/Ubuntu/UbuntuGestures/timesource.h'
2604--- src/Ubuntu/UbuntuGestures/timesource.h 2015-11-09 08:31:43 +0000
2605+++ src/Ubuntu/UbuntuGestures/timesource.h 2016-06-22 15:52:01 +0000
2606@@ -22,7 +22,7 @@
2607 #include "ubuntugesturesglobal.h"
2608 #include <QSharedPointer>
2609
2610-namespace UbuntuGestures {
2611+UG_NAMESPACE_BEGIN
2612 /*
2613 Interface for a time source.
2614 */
2615@@ -57,6 +57,6 @@
2616 qint64 m_msecsSinceReference;
2617 };
2618
2619-} // namespace UbuntuGestures
2620+UG_NAMESPACE_END
2621
2622 #endif // UBUNTUGESTURES_TIMESOURCE_H
2623
2624=== modified file 'src/Ubuntu/UbuntuGestures/touchownershipevent.cpp'
2625--- src/Ubuntu/UbuntuGestures/touchownershipevent.cpp 2015-11-09 08:31:43 +0000
2626+++ src/Ubuntu/UbuntuGestures/touchownershipevent.cpp 2016-06-22 15:52:01 +0000
2627@@ -16,6 +16,8 @@
2628
2629 #include "touchownershipevent.h"
2630
2631+UG_NAMESPACE_BEGIN
2632+
2633 QEvent::Type TouchOwnershipEvent::m_touchOwnershipType = (QEvent::Type)-1;
2634
2635 TouchOwnershipEvent::TouchOwnershipEvent(int touchId, bool gained)
2636@@ -33,3 +35,5 @@
2637
2638 return m_touchOwnershipType;
2639 }
2640+
2641+UG_NAMESPACE_END
2642
2643=== modified file 'src/Ubuntu/UbuntuGestures/touchownershipevent.h'
2644--- src/Ubuntu/UbuntuGestures/touchownershipevent.h 2015-11-09 08:31:43 +0000
2645+++ src/Ubuntu/UbuntuGestures/touchownershipevent.h 2016-06-22 15:52:01 +0000
2646@@ -20,6 +20,7 @@
2647 #include <QEvent>
2648 #include "ubuntugesturesglobal.h"
2649
2650+UG_NAMESPACE_BEGIN
2651 /*
2652 When an item get an ownership event for a touch it can grab/steal that touch
2653 with a clean conscience.
2654@@ -47,4 +48,6 @@
2655 bool m_gained;
2656 };
2657
2658+UG_NAMESPACE_END
2659+
2660 #endif // UBUNTU_TOUCHOWNERSHIPEVENT_H
2661
2662=== modified file 'src/Ubuntu/UbuntuGestures/touchregistry.cpp'
2663--- src/Ubuntu/UbuntuGestures/touchregistry.cpp 2016-03-24 11:23:57 +0000
2664+++ src/Ubuntu/UbuntuGestures/touchregistry.cpp 2016-06-22 15:52:01 +0000
2665@@ -31,7 +31,7 @@
2666 #include "debughelpers.h"
2667 #define UG_DEBUG qCDebug(ugTouchRegistry) << "[TouchRegistry]"
2668
2669-using namespace UbuntuGestures;
2670+UG_NAMESPACE_BEGIN
2671
2672 TouchRegistry *TouchRegistry::m_instance = nullptr;
2673
2674@@ -524,3 +524,5 @@
2675 QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);
2676 }
2677 }
2678+
2679+UG_NAMESPACE_END
2680
2681=== modified file 'src/Ubuntu/UbuntuGestures/touchregistry.h'
2682--- src/Ubuntu/UbuntuGestures/touchregistry.h 2016-06-02 08:22:41 +0000
2683+++ src/Ubuntu/UbuntuGestures/touchregistry.h 2016-06-22 15:52:01 +0000
2684@@ -31,9 +31,7 @@
2685 // logging
2686 #include <QtCore/QLoggingCategory>
2687
2688-namespace UbuntuGestures {
2689- class AbstractTimerFactory;
2690-}
2691+UG_FORWARD_DECLARE_CLASS(AbstractTimerFactory)
2692
2693 /*
2694 Where the ownership of touches is registered.
2695@@ -93,6 +91,9 @@
2696
2697 [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)
2698 */
2699+
2700+UG_NAMESPACE_BEGIN
2701+
2702 class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject
2703 {
2704 Q_OBJECT
2705@@ -128,7 +129,7 @@
2706 void addTouchWatcher(int touchId, QQuickItem *watcherItem);
2707
2708 // Useful for tests, where you should use fake timers
2709- void setTimerFactory(UbuntuGestures::AbstractTimerFactory *timerFactory);
2710+ void setTimerFactory(AbstractTimerFactory *timerFactory);
2711
2712 private Q_SLOTS:
2713 void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);
2714@@ -153,7 +154,7 @@
2715 InterimOwner = 2
2716 } state;
2717 QPointer<QQuickItem> item;
2718- QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
2719+ QPointer<UG_PREPEND_NAMESPACE(CandidateInactivityTimer)> inactivityTimer;
2720 };
2721
2722 class TouchInfo {
2723@@ -195,12 +196,14 @@
2724
2725 bool m_inDispatchLoop;
2726
2727- UbuntuGestures::AbstractTimerFactory *m_timerFactory;
2728+ AbstractTimerFactory *m_timerFactory;
2729
2730 friend class tst_TouchRegistry;
2731 friend class tst_DirectionalDragArea;
2732 };
2733
2734+UG_NAMESPACE_END
2735+
2736 Q_DECLARE_LOGGING_CATEGORY(ugTouchRegistry)
2737
2738 #endif // UNITY_TOUCHREGISTRY_H
2739
2740=== modified file 'src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h'
2741--- src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h 2015-11-09 08:31:43 +0000
2742+++ src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h 2016-06-22 15:52:01 +0000
2743@@ -21,3 +21,27 @@
2744 #else
2745 # define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
2746 #endif
2747+
2748+#if defined(UBUNTUGESTURES_NAMESPACE)
2749+
2750+#define UG_NAMESPACE_BEGIN namespace UbuntuGestures {
2751+#define UG_NAMESPACE_END }
2752+#define UG_PREPEND_NAMESPACE(name) UbuntuGestures::name
2753+#define UG_USE_NAMESPACE using namespace UbuntuGestures;
2754+#define UG_FORWARD_DECLARE_CLASS(name) \
2755+ UG_NAMESPACE_BEGIN class name; UG_NAMESPACE_END \
2756+ using UG_PREPEND_NAMESPACE(name);
2757+#define UG_FORWARD_DECLARE_STRUCT(name) \
2758+ UG_NAMESPACE_BEGIN struct name; UG_NAMESPACE_END \
2759+ using UG_PREPEND_NAMESPACE(name);
2760+
2761+#else // no namespace
2762+
2763+#define UG_NAMESPACE_BEGIN
2764+#define UG_NAMESPACE_END
2765+#define UG_PREPEND_NAMESPACE(name) name
2766+#define UG_USE_NAMESPACE
2767+#define UG_FORWARD_DECLARE_CLASS(name) class name;
2768+#define UG_FORWARD_DECLARE_STRUCT(name) struct name;
2769+
2770+#endif
2771
2772=== added file 'src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp'
2773--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp 1970-01-01 00:00:00 +0000
2774+++ src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp 2016-06-22 15:52:01 +0000
2775@@ -0,0 +1,36 @@
2776+/*
2777+ * Copyright 2016 Canonical Ltd.
2778+ *
2779+ * This program is free software; you can redistribute it and/or modify
2780+ * it under the terms of the GNU Lesser General Public License as published by
2781+ * the Free Software Foundation; version 3.
2782+ *
2783+ * This program is distributed in the hope that it will be useful,
2784+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2785+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2786+ * GNU Lesser General Public License for more details.
2787+ *
2788+ * You should have received a copy of the GNU Lesser General Public License
2789+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2790+ *
2791+ * Author: Zsombor Egri <zsombor.egri@canonical.com>
2792+ */
2793+
2794+#include <QtQml/QQmlEngine>
2795+#include <QtQml>
2796+#include "ubuntugesturesmodule.h"
2797+#include <private/ucswipearea_p.h>
2798+
2799+UG_NAMESPACE_BEGIN
2800+
2801+void UbuntuGesturesModule::defineModule(const char *uri)
2802+{
2803+ qmlRegisterType<UCSwipeArea>(uri, 1, 3, "SwipeArea");
2804+}
2805+
2806+void UbuntuGesturesModule::undefineModule()
2807+{
2808+ // nothing so far
2809+}
2810+
2811+UG_NAMESPACE_END
2812
2813=== added file 'src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h'
2814--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h 1970-01-01 00:00:00 +0000
2815+++ src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h 2016-06-22 15:52:01 +0000
2816@@ -0,0 +1,35 @@
2817+/*
2818+ * Copyright 2016 Canonical Ltd.
2819+ *
2820+ * This program is free software; you can redistribute it and/or modify
2821+ * it under the terms of the GNU Lesser General Public License as published by
2822+ * the Free Software Foundation; version 3.
2823+ *
2824+ * This program is distributed in the hope that it will be useful,
2825+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2826+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2827+ * GNU Lesser General Public License for more details.
2828+ *
2829+ * You should have received a copy of the GNU Lesser General Public License
2830+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2831+ *
2832+ * Author: Zsombor Egri <zsombor.egri@canonical.com>
2833+ */
2834+
2835+#ifndef UBUNTUGESTURESMODULE_H
2836+#define UBUNTUGESTURESMODULE_H
2837+
2838+#include <ubuntugesturesglobal.h>
2839+
2840+UG_NAMESPACE_BEGIN
2841+
2842+class UBUNTUGESTURES_EXPORT UbuntuGesturesModule
2843+{
2844+public:
2845+ static void defineModule(const char *uri);
2846+ static void undefineModule();
2847+};
2848+
2849+UG_NAMESPACE_END
2850+
2851+#endif // UBUNTUGESTURESMODULE_H
2852
2853=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp'
2854--- src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-05-25 12:48:10 +0000
2855+++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-06-22 15:52:01 +0000
2856@@ -29,7 +29,7 @@
2857 #include <UbuntuGestures/TouchRegistry>
2858 #include <UbuntuGestures/UnownedTouchEvent>
2859
2860-using namespace UbuntuGestures;
2861+UG_NAMESPACE_BEGIN
2862
2863 Q_LOGGING_CATEGORY(ucSwipeArea, "ubuntu.components.SwipeArea", QtMsgType::QtWarningMsg)
2864 Q_LOGGING_CATEGORY(ucActiveTouchInfo, "ubuntu.components.SwipeArea.ActiveTouchInfo", QtMsgType::QtWarningMsg)
2865@@ -1055,3 +1055,5 @@
2866 {
2867 statusChangeListeners.removeAll(listener);
2868 }
2869+
2870+UG_NAMESPACE_END
2871
2872=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p.h'
2873--- src/Ubuntu/UbuntuGestures/ucswipearea_p.h 2016-03-07 15:56:06 +0000
2874+++ src/Ubuntu/UbuntuGestures/ucswipearea_p.h 2016-06-22 15:52:01 +0000
2875@@ -28,11 +28,11 @@
2876 // logging
2877 #include <QtCore/QLoggingCategory>
2878
2879+UG_NAMESPACE_BEGIN
2880+
2881 class TouchOwnershipEvent;
2882 class UnownedTouchEvent;
2883 class UCSwipeAreaPrivate;
2884-
2885-class UCSwipeAreaPrivate;
2886 class UBUNTUGESTURES_EXPORT UCSwipeArea : public QQuickItem
2887 {
2888 Q_OBJECT
2889@@ -101,6 +101,8 @@
2890 Q_DECLARE_PRIVATE(UCSwipeArea)
2891 };
2892
2893+UG_NAMESPACE_END
2894+
2895 Q_DECLARE_LOGGING_CATEGORY(ucSwipeArea)
2896 Q_DECLARE_LOGGING_CATEGORY(ucActiveTouchInfo)
2897
2898
2899=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h'
2900--- src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-01-08 17:03:07 +0000
2901+++ src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-06-22 15:52:01 +0000
2902@@ -23,6 +23,8 @@
2903
2904 #include "damper_p.h"
2905
2906+UG_NAMESPACE_BEGIN
2907+
2908 // Information about an active touch point
2909 struct UBUNTUGESTURES_EXPORT ActiveTouchInfo {
2910 ActiveTouchInfo() : id(-1), startTime(-1) {}
2911@@ -171,4 +173,6 @@
2912 virtual void swipeStatusChanged(UCSwipeAreaPrivate::Status /*old*/, UCSwipeAreaPrivate::Status /*new*/) {}
2913 };
2914
2915+UG_NAMESPACE_END
2916+
2917 #endif // UCSWIPEAREAPRIVATE_H
2918
2919=== modified file 'src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp'
2920--- src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp 2015-11-09 08:31:43 +0000
2921+++ src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp 2016-06-22 15:52:01 +0000
2922@@ -16,6 +16,8 @@
2923
2924 #include "unownedtouchevent.h"
2925
2926+UG_NAMESPACE_BEGIN
2927+
2928 QEvent::Type UnownedTouchEvent::m_unownedTouchEventType = (QEvent::Type)-1;
2929
2930 UnownedTouchEvent::UnownedTouchEvent(QTouchEvent *touchEvent)
2931@@ -37,3 +39,5 @@
2932 {
2933 return m_touchEvent.data();
2934 }
2935+
2936+UG_NAMESPACE_END
2937
2938=== modified file 'src/Ubuntu/UbuntuGestures/unownedtouchevent.h'
2939--- src/Ubuntu/UbuntuGestures/unownedtouchevent.h 2015-11-09 08:31:43 +0000
2940+++ src/Ubuntu/UbuntuGestures/unownedtouchevent.h 2016-06-22 15:52:01 +0000
2941@@ -21,6 +21,7 @@
2942 #include <QScopedPointer>
2943 #include "ubuntugesturesglobal.h"
2944
2945+UG_NAMESPACE_BEGIN
2946 /*
2947 A touch event with touch points that do not belong the item receiving it.
2948
2949@@ -42,4 +43,6 @@
2950 QScopedPointer<QTouchEvent> m_touchEvent;
2951 };
2952
2953+UG_NAMESPACE_END
2954+
2955 #endif // UBUNTU_UNOWNEDTOUCHEVENT_H
2956
2957=== modified file 'src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro'
2958--- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro 2016-06-02 12:50:02 +0000
2959+++ src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro 2016-06-22 15:52:01 +0000
2960@@ -3,6 +3,15 @@
2961
2962 QT *= core-private gui-private qml qml-private quick quick-private testlib
2963
2964+unix {
2965+ CONFIG += link_pkgconfig
2966+ PKGCONFIG += gio-2.0 dbus-1 libnih libnih-dbus
2967+}
2968+QT *= dbus svg UbuntuGestures UbuntuGestures_private
2969+
2970+# QOrganizer for Alarm API
2971+QT *= organizer
2972+
2973 !contains(QT_ARCH, arm) {
2974 DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
2975 LIBS += -lX11 -lxcb -lXi
2976@@ -15,11 +24,18 @@
2977 INCLUDEPATH+=$$PWD
2978
2979 DEFINES += UBUNTUTOOLKIT_LIBRARY
2980+#comment in the following line to disable traces
2981+#DEFINES += QT_NO_DEBUG_OUTPUT
2982+DEFINES += QT_USE_QSTRINGBUILDER
2983
2984 load(qt_build_config)
2985 load(ubuntu_qt_module)
2986
2987-HEADERS += \
2988+QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
2989+DEFINES -= QT_DEPRECATED_WARNINGS
2990+DEFINES -= QT_ASCII_CAST_WARNINGS
2991+
2992+HEADERS += \
2993 colorutils.h \
2994 ubuntutoolkitglobal.h \
2995 tree.h \
2996@@ -27,11 +43,202 @@
2997 asyncloader_p.h \
2998 mousetouchadaptor.h \
2999 mousetouchadaptor_p.h \
3000- propertychange.h
3001+ propertychange.h \
3002+ ubuntutoolkitmodule.h
3003
3004 SOURCES += \
3005 colorutils.cpp \
3006 tree.cpp \
3007 asyncloader.cpp \
3008 mousetouchadaptor.cpp \
3009- propertychange.cpp
3010+ propertychange.cpp \
3011+ ubuntutoolkitmodule.cpp
3012+
3013+HEADERS += \
3014+ uctheme.h \
3015+ i18n.h \
3016+ listener.h \
3017+ ucscalingimageprovider.h \
3018+ ucunits.h \
3019+ ucqquickimageextension.h \
3020+ quickutils.h \
3021+ ucubuntushapetextures.h \
3022+ ucubuntushape.h \
3023+ ucubuntushapeoverlay.h \
3024+ ucproportionalshape.h \
3025+ inversemouseareatype.h \
3026+ qquickclipboard.h \
3027+ qquickmimedata.h \
3028+ qquickclipboard_p.h \
3029+ ucubuntuanimation.h \
3030+ ucfontutils.h \
3031+ ucapplication.h \
3032+ ucarguments.h \
3033+ ucargument.h \
3034+ ucalarm.h \
3035+ ucalarm_p.h \
3036+ alarmmanager_p_p.h \
3037+ alarmmanager_p.h \
3038+ ucalarmmodel.h \
3039+ unitythemeiconprovider.h \
3040+ adapters/alarmsadapter_p.h \
3041+ ucstatesaver.h \
3042+ sortbehavior.h \
3043+ filterbehavior.h \
3044+ sortfiltermodel.h \
3045+ statesaverbackend_p.h \
3046+ ucstatesaver_p.h \
3047+ ucurihandler.h \
3048+ ucinversemouse.h \
3049+ ucmouse.h \
3050+ unixsignalhandler_p.h \
3051+ ucstyleditembase.h \
3052+ ucstyleditembase_p.h \
3053+ ucaction.h \
3054+ ucactioncontext.h \
3055+ ucactionmanager.h \
3056+ adapters/actionsproxy_p.h \
3057+ adapters/dbuspropertywatcher_p.h \
3058+ uclistitem.h \
3059+ uclistitem_p.h \
3060+ uclistitemactions.h \
3061+ uclistitemactions_p.h \
3062+ uclistitemstyle.h \
3063+ ucserviceproperties.h \
3064+ ucserviceproperties_p.h \
3065+ privates/listitemdragarea.h \
3066+ privates/listitemdraghandler.h \
3067+ privates/listitemselection.h \
3068+ ucdeprecatedtheme.h \
3069+ ucdefaulttheme.h \
3070+ ucstylehints.h \
3071+ ucslotslayout.h \
3072+ ucslotslayout_p.h \
3073+ livetimer.h \
3074+ livetimer_p.h \
3075+ timeutils_p.h \
3076+ ucactionitem.h \
3077+ ucactionitem_p.h \
3078+ uchaptics.h \
3079+ ucabstractbutton.h \
3080+ ucabstractbutton_p.h \
3081+ ucmargins.h \
3082+ ucthemingextension.h \
3083+ ucheader.h \
3084+ uclabel.h \
3085+ uclistitemlayout.h \
3086+ privates/threelabelsslot_p.h \
3087+ ucimportversionchecker_p.h \
3088+ ucbottomedgehint.h \
3089+ ucbottomedgehint_p.h \
3090+ ucmathutils.h \
3091+ ucbottomedge.h \
3092+ ucbottomedge_p.h \
3093+ ucbottomedgestyle.h \
3094+ ucbottomedgeregion.h \
3095+ ucpagetreenode.h \
3096+ ucpagetreenode_p.h \
3097+ ucmainviewbase.h \
3098+ ucmainviewbase_p.h \
3099+ ucperformancemonitor.h \
3100+ privates/listviewextensions.h \
3101+ privates/frame.h \
3102+ privates/ucpagewrapper.h \
3103+ privates/ucpagewrapper_p.h \
3104+ privates/ucpagewrapperincubator_p.h \
3105+ privates/appheaderbase.h \
3106+ label_p.h \
3107+ ucbottomedgeregion_p.h
3108+
3109+SOURCES += \
3110+ uctheme.cpp \
3111+ i18n.cpp \
3112+ listener.cpp \
3113+ ucscalingimageprovider.cpp \
3114+ ucunits.cpp \
3115+ ucqquickimageextension.cpp \
3116+ quickutils.cpp \
3117+ ucubuntushapetextures.cpp \
3118+ ucubuntushape.cpp \
3119+ ucubuntushapeoverlay.cpp \
3120+ ucproportionalshape.cpp \
3121+ inversemouseareatype.cpp \
3122+ qquickclipboard.cpp \
3123+ qquickmimedata.cpp \
3124+ ucubuntuanimation.cpp \
3125+ ucfontutils.cpp \
3126+ ucapplication.cpp \
3127+ ucarguments.cpp \
3128+ ucargument.cpp \
3129+ ucalarm.cpp \
3130+ alarmmanager_p.cpp \
3131+ ucalarmmodel.cpp \
3132+ unitythemeiconprovider.cpp \
3133+ ucstatesaver.cpp \
3134+ sortbehavior.cpp \
3135+ filterbehavior.cpp \
3136+ sortfiltermodel.cpp \
3137+ statesaverbackend_p.cpp \
3138+ ucurihandler.cpp \
3139+ ucmousefilters.cpp \
3140+ unixsignalhandler_p.cpp \
3141+ ucstyleditembase.cpp \
3142+ ucaction.cpp \
3143+ ucactioncontext.cpp \
3144+ ucactionmanager.cpp \
3145+ adapters/actionsproxy_p.cpp \
3146+ adapters/dbuspropertywatcher_p.cpp \
3147+ uclistitem.cpp \
3148+ uclistitemactions.cpp \
3149+ uclistitemstyle.cpp \
3150+ ucviewitemsattached.cpp \
3151+ ucserviceproperties.cpp \
3152+ privates/listitemdragarea.cpp \
3153+ privates/listitemdraghandler.cpp \
3154+ privates/listitemexpansion.cpp \
3155+ privates/listitemselection.cpp \
3156+ ucdeprecatedtheme.cpp \
3157+ ucdefaulttheme.cpp \
3158+ ucstylehints.cpp \
3159+ ucslotslayout.cpp \
3160+ livetimer.cpp \
3161+ livetimer_p.cpp \
3162+ ucactionitem.cpp \
3163+ uchaptics.cpp \
3164+ ucabstractbutton.cpp \
3165+ ucthemingextension.cpp \
3166+ ucheader.cpp \
3167+ uclabel.cpp \
3168+ uclistitemlayout.cpp \
3169+ privates/threelabelsslot_p.cpp \
3170+ ucimportversionchecker_p.cpp \
3171+ ucbottomedgehint.cpp \
3172+ ucmathutils.cpp \
3173+ ucbottomedge.cpp \
3174+ ucbottomedgestyle.cpp \
3175+ ucbottomedgeregion.cpp \
3176+ ucpagetreenode.cpp \
3177+ ucmainviewbase.cpp \
3178+ ucperformancemonitor.cpp \
3179+ privates/listviewextensions.cpp \
3180+ privates/frame.cpp \
3181+ privates/ucpagewrapper.cpp \
3182+ privates/ucpagewrapperincubator.cpp \
3183+ privates/appheaderbase.cpp
3184+
3185+# adapters
3186+SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
3187+
3188+#resources
3189+RESOURCES += \
3190+ $$PWD/resources.qrc
3191+
3192+OTHER_FILES += \
3193+ $$PWD/shaders/shape.vert \
3194+ $$PWD/shaders/shape.frag \
3195+ $$PWD/shaders/shape_no_dfdy.frag \
3196+ $$PWD/shaders/shapeoverlay.vert \
3197+ $$PWD/shaders/shapeoverlay.frag \
3198+ $$PWD/shaders/shapeoverlay_no_dfdy.frag \
3199+ $$PWD/privates/shaders/frame.vert \
3200+ $$PWD/privates/shaders/frame.frag
3201
3202=== renamed directory 'src/Ubuntu/Components/plugin/adapters' => 'src/Ubuntu/UbuntuToolkit/adapters'
3203=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp'
3204--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp 2015-12-22 14:42:59 +0000
3205+++ src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp 2016-06-22 15:52:01 +0000
3206@@ -23,6 +23,8 @@
3207
3208 #define AP_TRACE(params) qCDebug(ucActionProxy) << params
3209
3210+UT_NAMESPACE_BEGIN
3211+
3212 ActionProxy::ActionProxy()
3213 : globalContext(new UCActionContext)
3214 {
3215@@ -155,3 +157,5 @@
3216 {
3217 Q_UNUSED(context);
3218 }
3219+
3220+UT_NAMESPACE_END
3221
3222=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h'
3223--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h 2015-12-22 14:42:59 +0000
3224+++ src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h 2016-06-22 15:52:01 +0000
3225@@ -22,6 +22,8 @@
3226 #include <QtCore/QPointer>
3227 #include "ucaction.h"
3228
3229+UT_NAMESPACE_BEGIN
3230+
3231 class UCActionContext;
3232 class UCPopupContext;
3233 class ActionProxy
3234@@ -58,4 +60,6 @@
3235 void removePopupContext(UCPopupContext *context);
3236 };
3237
3238+UT_NAMESPACE_END
3239+
3240 #endif // ACTIONSPROXY_P_H
3241
3242=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp'
3243--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp 2015-03-24 16:51:39 +0000
3244+++ src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp 2016-06-22 15:52:01 +0000
3245@@ -48,6 +48,8 @@
3246
3247 QTORGANIZER_USE_NAMESPACE
3248
3249+UT_NAMESPACE_BEGIN
3250+
3251 /*-----------------------------------------------------------------------------
3252 * Adaptation layer for Alarm Data.
3253 */
3254@@ -821,3 +823,5 @@
3255 }
3256 }
3257 }
3258+
3259+UT_NAMESPACE_END
3260
3261=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h'
3262--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h 2016-05-13 08:39:18 +0000
3263+++ src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h 2016-06-22 15:52:01 +0000
3264@@ -19,19 +19,22 @@
3265 #ifndef ALARMSADAPTER_P_H
3266 #define ALARMSADAPTER_P_H
3267
3268-#include "alarmmanager_p_p.h"
3269+#include "private/alarmmanager_p_p.h"
3270
3271 #include <qorganizer.h>
3272 #include <qorganizermanager.h>
3273 #include <qorganizertodo.h>
3274+#include <ubuntutoolkitglobal.h>
3275
3276 QTORGANIZER_USE_NAMESPACE
3277
3278+UT_NAMESPACE_BEGIN
3279+
3280 /*-----------------------------------------------------------------------------
3281 * Adaptation layer for Alarms.
3282 */
3283
3284-class AlarmDataAdapter : public UCAlarmPrivate
3285+class UBUNTUTOOLKIT_EXPORT AlarmDataAdapter : public UCAlarmPrivate
3286 {
3287 public:
3288 AlarmDataAdapter(UCAlarm *qq);
3289@@ -206,4 +209,6 @@
3290 QOrganizerTodo todoItem(const QOrganizerItemId &id);
3291 };
3292
3293+UT_NAMESPACE_END
3294+
3295 #endif // ALARMSADAPTER_P_H
3296
3297=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp'
3298--- src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp 2016-01-30 12:03:31 +0000
3299+++ src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp 2016-06-22 15:52:01 +0000
3300@@ -23,6 +23,8 @@
3301
3302 #define DYNAMIC_PROPERTY "__q_property"
3303
3304+UT_NAMESPACE_BEGIN
3305+
3306 UCServicePropertiesPrivate *createServicePropertiesAdapter(UCServiceProperties *owner)
3307 {
3308 return new DBusServiceProperties(owner);
3309@@ -224,3 +226,5 @@
3310 readProperty(property);
3311 }
3312 }
3313+
3314+UT_NAMESPACE_END
3315
3316=== modified file 'src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h'
3317--- src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h 2016-04-28 11:19:46 +0000
3318+++ src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h 2016-06-22 15:52:01 +0000
3319@@ -25,6 +25,9 @@
3320 #include "ucserviceproperties_p.h"
3321
3322 class QDBusPendingCallWatcher;
3323+
3324+UT_NAMESPACE_BEGIN
3325+
3326 class DBusServiceProperties : public QObject, public UCServicePropertiesPrivate
3327 {
3328 Q_OBJECT
3329@@ -52,4 +55,6 @@
3330 void updateProperties(const QString &iface, const QVariantMap &map, const QStringList &invalidated);
3331 };
3332
3333+UT_NAMESPACE_END
3334+
3335 #endif // DBUSPROPERTYWATCHER_P_H
3336
3337=== renamed file 'src/Ubuntu/Components/plugin/alarmmanager_p.cpp' => 'src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp'
3338--- src/Ubuntu/Components/plugin/alarmmanager_p.cpp 2015-02-26 15:09:23 +0000
3339+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp 2016-06-22 15:52:01 +0000
3340@@ -21,6 +21,8 @@
3341 #include "ucalarm.h"
3342 #include "ucalarm_p.h"
3343
3344+UT_NAMESPACE_BEGIN
3345+
3346 AlarmManagerPrivate::AlarmManagerPrivate(AlarmManager *qq)
3347 : q_ptr(qq)
3348 , completed(false)
3349@@ -88,4 +90,6 @@
3350 return AlarmManagerPrivate::get()->createAlarmData(alarm);
3351 }
3352
3353+UT_NAMESPACE_END
3354+
3355 #include "moc_alarmmanager_p.cpp"
3356
3357=== renamed file 'src/Ubuntu/Components/plugin/alarmmanager_p.h' => 'src/Ubuntu/UbuntuToolkit/alarmmanager_p.h'
3358--- src/Ubuntu/Components/plugin/alarmmanager_p.h 2015-02-26 10:27:56 +0000
3359+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p.h 2016-06-22 15:52:01 +0000
3360@@ -25,6 +25,8 @@
3361
3362 #include "ucalarm.h"
3363
3364+UT_NAMESPACE_BEGIN
3365+
3366 class AlarmUtils {
3367 public:
3368 static QHash<int, QByteArray> roles() {
3369@@ -72,7 +74,7 @@
3370 class AlarmManagerPrivate;
3371 class AlarmRequestPrivate;
3372 class AlarmList;
3373-class AlarmManager : public QObject
3374+class UBUNTUTOOLKIT_EXPORT AlarmManager : public QObject
3375 {
3376 Q_OBJECT
3377 public:
3378@@ -122,4 +124,6 @@
3379 QScopedPointer<AlarmManagerPrivate> d_ptr;
3380 };
3381
3382+UT_NAMESPACE_END
3383+
3384 #endif // ALARMMANAGER_H
3385
3386=== renamed file 'src/Ubuntu/Components/plugin/alarmmanager_p_p.h' => 'src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h'
3387--- src/Ubuntu/Components/plugin/alarmmanager_p_p.h 2015-02-26 15:09:23 +0000
3388+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h 2016-06-22 15:52:01 +0000
3389@@ -24,7 +24,9 @@
3390 #include "alarmmanager_p.h"
3391 #include <QtCore/QUrl>
3392
3393-class AlarmManagerPrivate
3394+UT_NAMESPACE_BEGIN
3395+
3396+class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate
3397 {
3398 Q_DECLARE_PUBLIC(AlarmManager)
3399 public:
3400@@ -58,4 +60,6 @@
3401
3402 AlarmManagerPrivate * createAlarmsAdapter(AlarmManager *alarms);
3403
3404+UT_NAMESPACE_END
3405+
3406 #endif // ALARMMANAGER_P_H
3407
3408=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.cpp'
3409--- src/Ubuntu/UbuntuToolkit/asyncloader.cpp 2016-03-16 17:20:49 +0000
3410+++ src/Ubuntu/UbuntuToolkit/asyncloader.cpp 2016-06-22 15:52:01 +0000
3411@@ -22,7 +22,7 @@
3412 #include <QtQml/QQmlComponent>
3413 #include <QtQuick/QQuickItem>
3414
3415-namespace UbuntuToolkit {
3416+UT_NAMESPACE_BEGIN
3417
3418 AsyncLoader::AsyncLoader(QObject *parent)
3419 : QObject(*(new AsyncLoaderPrivate), parent)
3420@@ -218,4 +218,4 @@
3421 d_func()->forceCompletion();
3422 }
3423
3424-} // namespace UbuntuToolkit
3425+UT_NAMESPACE_END
3426
3427=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.h'
3428--- src/Ubuntu/UbuntuToolkit/asyncloader.h 2016-04-01 05:30:24 +0000
3429+++ src/Ubuntu/UbuntuToolkit/asyncloader.h 2016-06-22 15:52:01 +0000
3430@@ -25,7 +25,7 @@
3431 class QQuickItem;
3432 class QQmlContext;
3433
3434-namespace UbuntuToolkit {
3435+UT_NAMESPACE_BEGIN
3436
3437 class AsyncLoaderPrivate;
3438 class UBUNTUTOOLKIT_EXPORT AsyncLoader : public QObject
3439@@ -58,6 +58,6 @@
3440 Q_DECLARE_PRIVATE(AsyncLoader)
3441 };
3442
3443-} // namespace UbuntuToolkit
3444+UT_NAMESPACE_END
3445
3446 #endif // ASYNCLOADER_H
3447
3448=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader_p.h'
3449--- src/Ubuntu/UbuntuToolkit/asyncloader_p.h 2016-02-25 14:30:46 +0000
3450+++ src/Ubuntu/UbuntuToolkit/asyncloader_p.h 2016-06-22 15:52:01 +0000
3451@@ -21,9 +21,10 @@
3452
3453 #include <QtCore/private/qobject_p.h>
3454 #include <QtQml/QQmlIncubator>
3455-#include <AsyncLoader>
3456+#include <ubuntutoolkitglobal.h>
3457+#include <asyncloader.h>
3458
3459-namespace UbuntuToolkit {
3460+UT_NAMESPACE_BEGIN
3461
3462 class AsyncLoaderPrivate : public QObjectPrivate, public QQmlIncubator
3463 {
3464@@ -48,7 +49,7 @@
3465 void detachComponent();
3466 };
3467
3468-} // namespace UbuntuToolkit
3469+UT_NAMESPACE_END
3470
3471 #endif // ASYNCLOADER_P_H
3472
3473
3474=== modified file 'src/Ubuntu/UbuntuToolkit/colorutils.cpp'
3475--- src/Ubuntu/UbuntuToolkit/colorutils.cpp 2016-01-22 09:31:54 +0000
3476+++ src/Ubuntu/UbuntuToolkit/colorutils.cpp 2016-06-22 15:52:01 +0000
3477@@ -17,7 +17,7 @@
3478 #include "colorutils.h"
3479 #include <QColor>
3480
3481-namespace UbuntuToolkit {
3482+UT_NAMESPACE_BEGIN
3483
3484 ColorUtils::ColorUtils(QObject *parent) : QObject(parent)
3485 {}
3486@@ -27,4 +27,4 @@
3487 return color.lightnessF();
3488 }
3489
3490-}
3491+UT_NAMESPACE_END
3492
3493=== modified file 'src/Ubuntu/UbuntuToolkit/colorutils.h'
3494--- src/Ubuntu/UbuntuToolkit/colorutils.h 2016-01-26 09:57:35 +0000
3495+++ src/Ubuntu/UbuntuToolkit/colorutils.h 2016-06-22 15:52:01 +0000
3496@@ -19,7 +19,7 @@
3497 #include <QObject>
3498 #include "ubuntutoolkitglobal.h"
3499
3500-namespace UbuntuToolkit {
3501+UT_NAMESPACE_BEGIN
3502
3503 class UBUNTUTOOLKIT_EXPORT ColorUtils : public QObject
3504 {
3505@@ -29,6 +29,6 @@
3506 Q_INVOKABLE static qreal luminance(const QColor &color);
3507 };
3508
3509-}
3510+UT_NAMESPACE_END
3511
3512 #endif // COLORUTILS_H
3513
3514=== renamed file 'src/Ubuntu/Components/plugin/filterbehavior.cpp' => 'src/Ubuntu/UbuntuToolkit/filterbehavior.cpp'
3515--- src/Ubuntu/Components/plugin/filterbehavior.cpp 2014-06-04 16:59:07 +0000
3516+++ src/Ubuntu/UbuntuToolkit/filterbehavior.cpp 2016-06-22 15:52:01 +0000
3517@@ -19,6 +19,8 @@
3518
3519 #include "filterbehavior.h"
3520
3521+UT_NAMESPACE_BEGIN
3522+
3523 FilterBehavior::FilterBehavior(QObject *parent)
3524 : QObject(parent)
3525 , m_property(QString())
3526@@ -53,3 +55,4 @@
3527 Q_EMIT patternChanged();
3528 }
3529
3530+UT_NAMESPACE_END
3531
3532=== renamed file 'src/Ubuntu/Components/plugin/filterbehavior.h' => 'src/Ubuntu/UbuntuToolkit/filterbehavior.h'
3533--- src/Ubuntu/Components/plugin/filterbehavior.h 2014-06-04 16:59:07 +0000
3534+++ src/Ubuntu/UbuntuToolkit/filterbehavior.h 2016-06-22 15:52:01 +0000
3535@@ -21,8 +21,11 @@
3536 #define FILTERBEHAVIOR_H
3537
3538 #include <QSortFilterProxyModel>
3539-
3540-class FilterBehavior : public QObject {
3541+#include <ubuntutoolkitglobal.h>
3542+
3543+UT_NAMESPACE_BEGIN
3544+
3545+class UBUNTUTOOLKIT_EXPORT FilterBehavior : public QObject {
3546 Q_OBJECT
3547
3548 Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
3549@@ -45,4 +48,6 @@
3550 QRegExp m_pattern;
3551 };
3552
3553+UT_NAMESPACE_END
3554+
3555 #endif // FILTERBEHAVIOR_H
3556
3557=== renamed file 'src/Ubuntu/Components/plugin/i18n.cpp' => 'src/Ubuntu/UbuntuToolkit/i18n.cpp'
3558--- src/Ubuntu/Components/plugin/i18n.cpp 2016-06-20 14:31:12 +0000
3559+++ src/Ubuntu/UbuntuToolkit/i18n.cpp 2016-06-22 15:52:01 +0000
3560@@ -29,9 +29,9 @@
3561 #include <stdlib.h>
3562 #include <locale.h>
3563
3564+UT_NAMESPACE_BEGIN
3565 /*!
3566 * \qmltype i18n
3567- * \instantiates UbuntuI18n
3568 * \inqmlmodule Ubuntu.Components
3569 * \ingroup ubuntu
3570 * \brief i18n is a context property that provides internationalization support.
3571@@ -341,3 +341,5 @@
3572 }
3573 return datetime.toString(Qt::DefaultLocaleShortDate);
3574 }
3575+
3576+UT_NAMESPACE_END
3577
3578=== renamed file 'src/Ubuntu/Components/plugin/i18n.h' => 'src/Ubuntu/UbuntuToolkit/i18n.h'
3579--- src/Ubuntu/Components/plugin/i18n.h 2016-02-10 09:54:59 +0000
3580+++ src/Ubuntu/UbuntuToolkit/i18n.h 2016-06-22 15:52:01 +0000
3581@@ -20,11 +20,14 @@
3582 #define UBUNTU_COMPONENTS_I18N_H
3583
3584 #include <QtCore/QObject>
3585+#include <ubuntutoolkitglobal.h>
3586
3587 class QQmlContext;
3588 class QQmlEngine;
3589
3590-class UbuntuI18n : public QObject
3591+UT_NAMESPACE_BEGIN
3592+
3593+class UBUNTUTOOLKIT_EXPORT UbuntuI18n : public QObject
3594 {
3595 Q_OBJECT
3596 Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
3597@@ -75,4 +78,6 @@
3598 QString m_language;
3599 };
3600
3601+UT_NAMESPACE_END
3602+
3603 #endif // UBUNTU_COMPONENTS_I18N_H
3604
3605=== renamed file 'src/Ubuntu/Components/plugin/inversemouseareatype.cpp' => 'src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp'
3606--- src/Ubuntu/Components/plugin/inversemouseareatype.cpp 2016-05-25 12:48:10 +0000
3607+++ src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp 2016-06-22 15:52:01 +0000
3608@@ -18,9 +18,10 @@
3609 #include <QtGui/QGuiApplication>
3610 #include "quickutils.h"
3611
3612+UT_NAMESPACE_BEGIN
3613+
3614 /*!
3615 \qmltype InverseMouseArea
3616- \instantiates InverseMouseAreaType
3617 \inqmlmodule Ubuntu.Components
3618 \ingroup ubuntu
3619 \brief The InverseMouseArea captures mouse events happening outside of a given
3620@@ -568,3 +569,5 @@
3621 bool pointOutArea = (m_sensingArea && m_sensingArea->contains(m_sensingArea->mapFromScene(scenePos)));
3622 return !pointInArea && !pointInOSK && pointOutArea;
3623 }
3624+
3625+UT_NAMESPACE_END
3626
3627=== renamed file 'src/Ubuntu/Components/plugin/inversemouseareatype.h' => 'src/Ubuntu/UbuntuToolkit/inversemouseareatype.h'
3628--- src/Ubuntu/Components/plugin/inversemouseareatype.h 2016-04-28 11:19:46 +0000
3629+++ src/Ubuntu/UbuntuToolkit/inversemouseareatype.h 2016-06-22 15:52:01 +0000
3630@@ -18,9 +18,13 @@
3631
3632 #include <private/qquickmousearea_p.h>
3633 #include <QtCore/QPointer>
3634+#include <ubuntutoolkitglobal.h>
3635
3636 class QQuickItem;
3637-class InverseMouseAreaType : public QQuickMouseArea
3638+
3639+UT_NAMESPACE_BEGIN
3640+
3641+class UBUNTUTOOLKIT_EXPORT InverseMouseAreaType : public QQuickMouseArea
3642 {
3643 Q_OBJECT
3644 Q_PROPERTY(QQuickItem *sensingArea READ sensingArea WRITE setSensingArea NOTIFY sensingAreaChanged)
3645@@ -67,4 +71,6 @@
3646 void updateEventFilter(bool enable);
3647 };
3648
3649+UT_NAMESPACE_END
3650+
3651 #endif // INVERSEMOUSEAREATYPE_H
3652
3653=== renamed file 'src/Ubuntu/Components/plugin/label_p.h' => 'src/Ubuntu/UbuntuToolkit/label_p.h'
3654--- src/Ubuntu/Components/plugin/label_p.h 2016-04-25 15:15:52 +0000
3655+++ src/Ubuntu/UbuntuToolkit/label_p.h 2016-06-22 15:52:01 +0000
3656@@ -19,6 +19,8 @@
3657
3658 #include "uclabel.h"
3659
3660+UT_NAMESPACE_BEGIN
3661+
3662 class UCLabelPrivate
3663 {
3664 Q_DECLARE_PUBLIC(UCLabel)
3665@@ -55,5 +57,6 @@
3666 static QColor getDefaultColor(QQuickItem *item, UCTheme *theme);
3667 };
3668
3669+UT_NAMESPACE_END
3670+
3671 #endif // LABEL_P
3672-
3673
3674=== renamed file 'src/Ubuntu/Components/plugin/listener.cpp' => 'src/Ubuntu/UbuntuToolkit/listener.cpp'
3675--- src/Ubuntu/Components/plugin/listener.cpp 2015-02-12 07:31:08 +0000
3676+++ src/Ubuntu/UbuntuToolkit/listener.cpp 2016-06-22 15:52:01 +0000
3677@@ -18,6 +18,8 @@
3678
3679 #include <QQmlContext>
3680
3681+UT_NAMESPACE_BEGIN
3682+
3683 ContextPropertyChangeListener::ContextPropertyChangeListener(QQmlContext *context, const QString &contextProperty) :
3684 QObject(context),
3685 m_context(context),
3686@@ -30,3 +32,5 @@
3687 QVariant value = m_context->contextProperty(m_contextProperty);
3688 m_context->setContextProperty(m_contextProperty, value);
3689 }
3690+
3691+UT_NAMESPACE_END
3692
3693=== renamed file 'src/Ubuntu/Components/plugin/listener.h' => 'src/Ubuntu/UbuntuToolkit/listener.h'
3694--- src/Ubuntu/Components/plugin/listener.h 2015-02-12 07:31:08 +0000
3695+++ src/Ubuntu/UbuntuToolkit/listener.h 2016-06-22 15:52:01 +0000
3696@@ -17,11 +17,14 @@
3697 #ifndef UBUNTU_COMPONENTS_LISTENER_H
3698 #define UBUNTU_COMPONENTS_LISTENER_H
3699
3700-#include <QObject>
3701+#include <QtCore/QObject>
3702+#include <ubuntutoolkitglobal.h>
3703
3704 class QQmlContext;
3705
3706-class ContextPropertyChangeListener : public QObject
3707+UT_NAMESPACE_BEGIN
3708+
3709+class UBUNTUTOOLKIT_EXPORT ContextPropertyChangeListener : public QObject
3710 {
3711 Q_OBJECT
3712 public:
3713@@ -31,4 +34,6 @@
3714 QString m_contextProperty;
3715 };
3716
3717+UT_NAMESPACE_END
3718+
3719 #endif // UBUNTU_COMPONENTS_PLUGIN_H
3720
3721=== renamed file 'src/Ubuntu/Components/plugin/livetimer.cpp' => 'src/Ubuntu/UbuntuToolkit/livetimer.cpp'
3722--- src/Ubuntu/Components/plugin/livetimer.cpp 2016-05-25 12:48:10 +0000
3723+++ src/Ubuntu/UbuntuToolkit/livetimer.cpp 2016-06-22 15:52:01 +0000
3724@@ -17,8 +17,9 @@
3725 #include "livetimer.h"
3726 #include "livetimer_p.h"
3727
3728+UT_NAMESPACE_BEGIN
3729+
3730 /*! \qmltype LiveTimer
3731- \instantiates LiveTimer
3732 \inqmlmodule Ubuntu.Components
3733 \ingroup ubuntu
3734 \since Ubuntu.Components 1.3
3735@@ -140,3 +141,5 @@
3736 {
3737 m_effectiveFrequency = frequency;
3738 }
3739+
3740+UT_NAMESPACE_END
3741
3742=== renamed file 'src/Ubuntu/Components/plugin/livetimer.h' => 'src/Ubuntu/UbuntuToolkit/livetimer.h'
3743--- src/Ubuntu/Components/plugin/livetimer.h 2015-08-12 09:56:12 +0000
3744+++ src/Ubuntu/UbuntuToolkit/livetimer.h 2016-06-22 15:52:01 +0000
3745@@ -19,8 +19,11 @@
3746
3747 #include <QObject>
3748 #include <QDateTime>
3749-
3750-class LiveTimer : public QObject
3751+#include <ubuntutoolkitglobal.h>
3752+
3753+UT_NAMESPACE_BEGIN
3754+
3755+class UBUNTUTOOLKIT_EXPORT LiveTimer : public QObject
3756 {
3757 Q_OBJECT
3758 Q_ENUMS(Frequency)
3759@@ -65,4 +68,6 @@
3760 friend class SharedLiveTimer;
3761 };
3762
3763+UT_NAMESPACE_END
3764+
3765 #endif // LIVETIMER_H
3766
3767=== renamed file 'src/Ubuntu/Components/plugin/livetimer_p.cpp' => 'src/Ubuntu/UbuntuToolkit/livetimer_p.cpp'
3768--- src/Ubuntu/Components/plugin/livetimer_p.cpp 2015-07-20 15:34:32 +0000
3769+++ src/Ubuntu/UbuntuToolkit/livetimer_p.cpp 2016-06-22 15:52:01 +0000
3770@@ -19,6 +19,8 @@
3771
3772 #include <QDBusConnection>
3773
3774+UT_NAMESPACE_BEGIN
3775+
3776 SharedLiveTimer::SharedLiveTimer(QObject* parent)
3777 : QObject(parent)
3778 , m_frequency(LiveTimer::Disabled)
3779@@ -167,3 +169,5 @@
3780 }
3781 reInitTimer();
3782 }
3783+
3784+UT_NAMESPACE_END
3785
3786=== renamed file 'src/Ubuntu/Components/plugin/livetimer_p.h' => 'src/Ubuntu/UbuntuToolkit/livetimer_p.h'
3787--- src/Ubuntu/Components/plugin/livetimer_p.h 2015-07-20 15:34:32 +0000
3788+++ src/Ubuntu/UbuntuToolkit/livetimer_p.h 2016-06-22 15:52:01 +0000
3789@@ -21,6 +21,8 @@
3790
3791 #include <QTimer>
3792
3793+UT_NAMESPACE_BEGIN
3794+
3795 class SharedLiveTimer : public QObject
3796 {
3797 Q_OBJECT
3798@@ -55,4 +57,6 @@
3799 QDateTime m_lastUpdate;
3800 };
3801
3802+UT_NAMESPACE_END
3803+
3804 #endif // LIVETIMER_P_H
3805
3806=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp'
3807--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp 2016-04-07 14:03:00 +0000
3808+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp 2016-06-22 15:52:01 +0000
3809@@ -30,7 +30,7 @@
3810 #define ENABLE_TOUCH_EMULATION
3811 #endif
3812
3813-namespace UbuntuToolkit {
3814+UT_NAMESPACE_BEGIN
3815
3816 QTouchDevice *MouseTouchAdaptor::m_touchDevice = nullptr;
3817
3818@@ -133,6 +133,6 @@
3819 qWarning() << "MouseTouchAdaptor not available on this architecture, thus cannot be enabled.";
3820 }
3821
3822-} // namespace UbuntuToolkit
3823+UT_NAMESPACE_END
3824
3825 #include "moc_mousetouchadaptor.cpp"
3826
3827=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h'
3828--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h 2016-04-04 10:16:08 +0000
3829+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h 2016-06-22 15:52:01 +0000
3830@@ -29,7 +29,7 @@
3831 class QQmlEngine;
3832 class QJSEngine;
3833
3834-namespace UbuntuToolkit {
3835+UT_NAMESPACE_BEGIN
3836
3837 // Transforms QMouseEvents into single-finger QTouchEvents.
3838 class MouseTouchAdaptorPrivate;
3839@@ -58,6 +58,6 @@
3840 static QTouchDevice *m_touchDevice;
3841 };
3842
3843-} // namespace UbuntuToolkit
3844+UT_NAMESPACE_END
3845
3846 #endif // MOUSE_TOUCH_ADAPTOR_H
3847
3848=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
3849--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-05-13 08:39:18 +0000
3850+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-06-22 15:52:01 +0000
3851@@ -25,7 +25,7 @@
3852 #include <QWindow>
3853 #include <xcb/xcb.h>
3854
3855-namespace UbuntuToolkit {
3856+UT_NAMESPACE_BEGIN
3857
3858 class MouseTouchAdaptorPrivate : public QObjectPrivate, public QAbstractNativeEventFilter
3859 {
3860@@ -71,7 +71,7 @@
3861 };
3862 #endif
3863
3864-} // namespace UbuntuToolkit
3865+UT_NAMESPACE_END
3866
3867 #endif // MOUSETOUCHADAPTOR_P
3868
3869
3870=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp'
3871--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp 2016-04-07 14:03:00 +0000
3872+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp 2016-06-22 15:52:01 +0000
3873@@ -96,7 +96,7 @@
3874 } // end of anonymous namespace
3875
3876
3877-namespace UbuntuToolkit {
3878+UT_NAMESPACE_BEGIN
3879
3880 X11MouseTouchAdaptorPrivate::X11MouseTouchAdaptorPrivate()
3881 : m_leftButtonIsPressed(false)
3882@@ -279,10 +279,10 @@
3883
3884 QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
3885 false /* autoCommit */);
3886- touchEvent.press(0 /* touchId */, windowPos);
3887+ touchEvent.press(0 /* touchId */, windowPos, (QWindow*)nullptr);
3888 if (qtMod == TRI_PRESS_MODIFIER) {
3889- touchEvent.press(1, windowPos);
3890- touchEvent.press(2, windowPos);
3891+ touchEvent.press(1, windowPos, (QWindow*)nullptr);
3892+ touchEvent.press(2, windowPos, (QWindow*)nullptr);
3893 m_triPressModifier = true;
3894 }
3895 touchEvent.commit(false /* processEvents */);
3896@@ -305,10 +305,10 @@
3897
3898 QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
3899 false /* autoCommit */);
3900- touchEvent.release(0 /* touchId */, windowPos);
3901+ touchEvent.release(0 /* touchId */, windowPos, (QWindow*)nullptr);
3902 if (m_triPressModifier) {
3903- touchEvent.release(1, windowPos);
3904- touchEvent.release(2, windowPos);
3905+ touchEvent.release(1, windowPos, (QWindow*)nullptr);
3906+ touchEvent.release(2, windowPos, (QWindow*)nullptr);
3907 }
3908 touchEvent.commit(false /* processEvents */);
3909
3910@@ -330,15 +330,15 @@
3911
3912 QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
3913 false /* autoCommit */);
3914- touchEvent.move(0 /* touchId */, windowPos);
3915+ touchEvent.move(0 /* touchId */, windowPos, (QWindow*)nullptr);
3916 if (m_triPressModifier) {
3917 if (qtMod == TRI_PRESS_MODIFIER) {
3918- touchEvent.move(1, windowPos);
3919- touchEvent.move(2, windowPos);
3920+ touchEvent.move(1, windowPos, (QWindow*)nullptr);
3921+ touchEvent.move(2, windowPos, (QWindow*)nullptr);
3922 } else {
3923 // released modifiers
3924- touchEvent.release(1, windowPos);
3925- touchEvent.release(2, windowPos);
3926+ touchEvent.release(1, windowPos, (QWindow*)nullptr);
3927+ touchEvent.release(2, windowPos, (QWindow*)nullptr);
3928 m_triPressModifier = false;
3929 }
3930 }
3931@@ -347,4 +347,4 @@
3932 return true;
3933 }
3934
3935-} // namespace UbuntuToolkit
3936+UT_NAMESPACE_END
3937
3938=== renamed directory 'src/Ubuntu/Components/plugin/privates' => 'src/Ubuntu/UbuntuToolkit/privates'
3939=== modified file 'src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp'
3940--- src/Ubuntu/Components/plugin/privates/appheaderbase.cpp 2016-02-02 14:46:58 +0000
3941+++ src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp 2016-06-22 15:52:01 +0000
3942@@ -17,6 +17,8 @@
3943 #include "appheaderbase.h"
3944 #include "ucstyleditembase_p.h"
3945
3946+UT_NAMESPACE_BEGIN
3947+
3948 /*!
3949 \qmltype AppHeaderBase
3950 \instantiates UCAppHeaderBase
3951@@ -67,3 +69,5 @@
3952 Q_EMIT animateChanged();
3953 }
3954 }
3955+
3956+UT_NAMESPACE_END
3957
3958=== modified file 'src/Ubuntu/UbuntuToolkit/privates/appheaderbase.h'
3959--- src/Ubuntu/Components/plugin/privates/appheaderbase.h 2016-04-28 11:19:46 +0000
3960+++ src/Ubuntu/UbuntuToolkit/privates/appheaderbase.h 2016-06-22 15:52:01 +0000
3961@@ -18,19 +18,28 @@
3962 #define APPHEADERBASE_H
3963
3964 #include "ucheader.h"
3965+
3966+UT_NAMESPACE_BEGIN
3967+
3968 class UCTheme;
3969-
3970-class UCAppHeaderBase : public UCHeader
3971+class UBUNTUTOOLKIT_EXPORT UCAppHeaderBase : public UCHeader
3972 {
3973 Q_OBJECT
3974 Q_PROPERTY(bool animate MEMBER m_animate WRITE setAnimate NOTIFY animateChanged FINAL)
3975
3976 // FIXME Re-expose properties that would be inaccessible due to a QML bug
3977 // https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1389721
3978+#ifdef Q_QDOC
3979 Q_PROPERTY(UCTheme *theme
3980 READ theme2
3981 WRITE setTheme2
3982 NOTIFY themeChanged2 FINAL)
3983+#else
3984+ Q_PROPERTY(UT_PREPEND_NAMESPACE(UCTheme) *theme
3985+ READ theme2
3986+ WRITE setTheme2
3987+ NOTIFY themeChanged2 FINAL)
3988+#endif
3989
3990 public:
3991 explicit UCAppHeaderBase(QQuickItem *parent = 0);
3992@@ -51,4 +60,6 @@
3993 bool m_animate:1;
3994 };
3995
3996+UT_NAMESPACE_END
3997+
3998 #endif // APPHEADERBASE_H
3999
4000=== modified file 'src/Ubuntu/UbuntuToolkit/privates/frame.cpp'
4001--- src/Ubuntu/Components/plugin/privates/frame.cpp 2016-04-28 11:19:46 +0000
4002+++ src/Ubuntu/UbuntuToolkit/privates/frame.cpp 2016-06-22 15:52:01 +0000
4003@@ -21,6 +21,8 @@
4004 #include <QtGui/QOpenGLContext>
4005 #include <QtGui/QOpenGLFunctions>
4006
4007+UT_NAMESPACE_BEGIN
4008+
4009 const QRgb defaultColor = qRgba(255, 255, 255, 255);
4010 const float defaultThickness = 20.0f;
4011 const float defaultRadius = 50.0f;
4012@@ -467,3 +469,5 @@
4013
4014 return node;
4015 }
4016+
4017+UT_NAMESPACE_END
4018
4019=== modified file 'src/Ubuntu/UbuntuToolkit/privates/frame.h'
4020--- src/Ubuntu/Components/plugin/privates/frame.h 2016-04-28 11:19:46 +0000
4021+++ src/Ubuntu/UbuntuToolkit/privates/frame.h 2016-06-22 15:52:01 +0000
4022@@ -22,6 +22,9 @@
4023 #include <QtQuick/QQuickItem>
4024 #include <QtQuick/QSGMaterial>
4025 #include <QtQuick/QSGNode>
4026+#include <ubuntutoolkitglobal.h>
4027+
4028+UT_NAMESPACE_BEGIN
4029
4030 class UCFrameMaterial : public QSGMaterial
4031 {
4032@@ -54,7 +57,7 @@
4033 };
4034
4035 // Renders the frame (border) of a shape.
4036-class UCFrame : public QQuickItem
4037+class UBUNTUTOOLKIT_EXPORT UCFrame : public QQuickItem
4038 {
4039 Q_OBJECT
4040
4041@@ -96,6 +99,6 @@
4042 Q_DISABLE_COPY(UCFrame)
4043 };
4044
4045-QML_DECLARE_TYPE(UCFrame)
4046+UT_NAMESPACE_END
4047
4048 #endif // FRAME_H
4049
4050=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp'
4051--- src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp 2016-04-20 15:00:27 +0000
4052+++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp 2016-06-22 15:52:01 +0000
4053@@ -31,6 +31,8 @@
4054 #define MAX(x, y) ((x) > (y) ? (x) : (y))
4055 #define CLAMP(v, min, max) ((min) <= (max) ? MAX(min, MIN(v, max)) : MAX(max, MIN(v, min)))
4056
4057+UT_NAMESPACE_BEGIN
4058+
4059 ListItemDragArea::ListItemDragArea(QQuickItem *parent)
4060 : QQuickItem(parent)
4061 , listView(static_cast<QQuickFlickable*>(parent))
4062@@ -310,3 +312,5 @@
4063 UCListItemPrivate::get(item)->dragHandler->update(targetItem);
4064 }
4065 }
4066+
4067+UT_NAMESPACE_END
4068
4069=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.h'
4070--- src/Ubuntu/Components/plugin/privates/listitemdragarea.h 2016-04-28 11:19:46 +0000
4071+++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.h 2016-06-22 15:52:01 +0000
4072@@ -22,6 +22,9 @@
4073 #include <QtCore/QPointer>
4074
4075 class QQuickFlickable;
4076+
4077+UT_NAMESPACE_BEGIN
4078+
4079 class ListItemDragArea : public QQuickItem
4080 {
4081 Q_OBJECT
4082@@ -52,4 +55,6 @@
4083 void updateDraggedItem();
4084 };
4085
4086+UT_NAMESPACE_END
4087+
4088 #endif // LISTITEMDRAGAREA_H
4089
4090=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp'
4091--- src/Ubuntu/Components/plugin/privates/listitemdraghandler.cpp 2016-06-02 12:50:02 +0000
4092+++ src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp 2016-06-22 15:52:01 +0000
4093@@ -17,9 +17,10 @@
4094 #include "listitemdraghandler.h"
4095 #include "uclistitem.h"
4096 #include "uclistitem_p.h"
4097+#include <propertychange.h>
4098 #include <QtQuick/private/qquickanimation_p.h>
4099
4100-using namespace UbuntuToolkit;
4101+UT_NAMESPACE_BEGIN
4102
4103 ListItemDragHandler::ListItemDragHandler(UCListItem *baseItem, UCListItem *listItem)
4104 : QObject(listItem)
4105@@ -28,7 +29,7 @@
4106 , baseVisible(nullptr)
4107 {
4108 targetPos = baseItem->position();
4109- baseVisible = new UbuntuToolkit::PropertyChange(baseItem, "visible");
4110+ baseVisible = new PropertyChange(baseItem, "visible");
4111 }
4112
4113 ListItemDragHandler::~ListItemDragHandler()
4114@@ -39,7 +40,7 @@
4115
4116 void ListItemDragHandler::init()
4117 {
4118- UbuntuToolkit::PropertyChange::setValue(baseVisible, false);
4119+ PropertyChange::setValue(baseVisible, false);
4120 // position the item and show it
4121 listItem->setPosition(baseItem->position());
4122 listItem->setZ(2);
4123@@ -85,3 +86,5 @@
4124 targetPos = hoveredItem->position();
4125 }
4126 }
4127+
4128+UT_NAMESPACE_END
4129
4130=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.h'
4131--- src/Ubuntu/Components/plugin/privates/listitemdraghandler.h 2016-06-02 12:50:02 +0000
4132+++ src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.h 2016-06-22 15:52:01 +0000
4133@@ -20,11 +20,12 @@
4134 #include <QtCore/QObject>
4135 #include <QtCore/QPointer>
4136 #include <QtCore/QPointF>
4137-#include <PropertyChange>
4138+#include <ubuntutoolkitglobal.h>
4139
4140-using namespace UbuntuToolkit;
4141+UT_NAMESPACE_BEGIN
4142
4143 class UCListItem;
4144+class PropertyChange;
4145 class ListItemDragHandler : public QObject
4146 {
4147 Q_OBJECT
4148@@ -46,4 +47,6 @@
4149 QPointF targetPos;
4150 };
4151
4152+UT_NAMESPACE_END
4153+
4154 #endif // LISTITEMDRAGHANDLER_H
4155
4156=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemexpansion.cpp'
4157--- src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp 2015-09-23 14:31:26 +0000
4158+++ src/Ubuntu/UbuntuToolkit/privates/listitemexpansion.cpp 2016-06-22 15:52:01 +0000
4159@@ -17,6 +17,8 @@
4160 #include "uclistitem.h"
4161 #include "uclistitem_p.h"
4162
4163+UT_NAMESPACE_BEGIN
4164+
4165 UCListItemExpansion::UCListItemExpansion(QObject *parent)
4166 : QObject(parent)
4167 , m_listItem(static_cast<UCListItem*>(parent))
4168@@ -104,3 +106,5 @@
4169 m_height = height;
4170 Q_EMIT heightChanged();
4171 }
4172+
4173+UT_NAMESPACE_END
4174
4175=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp'
4176--- src/Ubuntu/Components/plugin/privates/listitemselection.cpp 2015-11-16 16:24:42 +0000
4177+++ src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp 2016-06-22 15:52:01 +0000
4178@@ -17,6 +17,8 @@
4179 #include "listitemselection.h"
4180 #include "uclistitem_p.h"
4181
4182+UT_NAMESPACE_BEGIN
4183+
4184 ListItemSelection::ListItemSelection(UCListItem *parent)
4185 : QObject(parent)
4186 , hostItem(parent)
4187@@ -139,3 +141,5 @@
4188 Q_EMIT hostItem->selectedChanged();
4189 }
4190 }
4191+
4192+UT_NAMESPACE_END
4193
4194=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemselection.h'
4195--- src/Ubuntu/Components/plugin/privates/listitemselection.h 2015-11-16 16:24:42 +0000
4196+++ src/Ubuntu/UbuntuToolkit/privates/listitemselection.h 2016-06-22 15:52:01 +0000
4197@@ -19,6 +19,9 @@
4198
4199 #include <QtCore/QObject>
4200 #include <QtCore/QPointer>
4201+#include <ubuntutoolkitglobal.h>
4202+
4203+UT_NAMESPACE_BEGIN
4204
4205 class UCViewItemsAttached;
4206 class UCListItem;
4207@@ -53,4 +56,6 @@
4208 void syncWithViewItems();
4209 };
4210
4211+UT_NAMESPACE_END
4212+
4213 #endif // LISTITEMSELECTION_H
4214
4215=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp'
4216--- src/Ubuntu/Components/plugin/privates/listviewextensions.cpp 2016-04-21 15:16:02 +0000
4217+++ src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp 2016-06-22 15:52:01 +0000
4218@@ -22,6 +22,8 @@
4219 #include <QtQuick/QQuickItem>
4220 #include <QtQuick/private/qquickflickable_p.h>
4221
4222+UT_NAMESPACE_BEGIN
4223+
4224 ListViewProxy::ListViewProxy(QQuickFlickable *listView, QObject *parent)
4225 : QObject(parent)
4226 , listView(listView)
4227@@ -151,3 +153,5 @@
4228
4229 return (oldIndex != currentIndex);
4230 }
4231+
4232+UT_NAMESPACE_END
4233
4234=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listviewextensions.h'
4235--- src/Ubuntu/Components/plugin/privates/listviewextensions.h 2016-01-15 06:33:03 +0000
4236+++ src/Ubuntu/UbuntuToolkit/privates/listviewextensions.h 2016-06-22 15:52:01 +0000
4237@@ -20,11 +20,15 @@
4238 #define LISTVIEWEXTENSIONS_H
4239
4240 #include <QtCore/QObject>
4241+#include <ubuntutoolkitglobal.h>
4242
4243 class QQuickFlickable;
4244 class QQuickItem;
4245 class QFocusEvent;
4246 class QKeyEvent;
4247+
4248+UT_NAMESPACE_BEGIN
4249+
4250 class ListViewProxy : public QObject
4251 {
4252 Q_OBJECT
4253@@ -57,4 +61,6 @@
4254 bool isEventFilter:1;
4255 };
4256
4257+UT_NAMESPACE_END
4258+
4259 #endif // LISTVIEWEXTENSIONS_H
4260
4261=== modified file 'src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp'
4262--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp 2016-04-20 15:00:27 +0000
4263+++ src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp 2016-06-22 15:52:01 +0000
4264@@ -20,6 +20,8 @@
4265 #include "ucfontutils.h"
4266 #include "uctheme.h"
4267
4268+UT_NAMESPACE_BEGIN
4269+
4270 UCThreeLabelsSlotPrivate::UCThreeLabelsSlotPrivate()
4271 : QQuickItemPrivate()
4272 , m_title(Q_NULLPTR)
4273@@ -238,3 +240,5 @@
4274 }
4275 return d->m_summary;
4276 }
4277+
4278+UT_NAMESPACE_END
4279
4280=== modified file 'src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h'
4281--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h 2016-01-27 16:02:15 +0000
4282+++ src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h 2016-06-22 15:52:01 +0000
4283@@ -19,20 +19,29 @@
4284
4285 #include <QQuickItem>
4286 #include <private/qquickitem_p.h>
4287+#include <ubuntutoolkitglobal.h>
4288
4289 //The padding between title and the string below it (i.e. subtitle, or
4290 //summary, when subtitle is empty)
4291 #define TITLE_SPACING_DP 2
4292
4293+UT_NAMESPACE_BEGIN
4294+
4295 class UCTheme;
4296 class UCLabel;
4297 class UCThreeLabelsSlotPrivate;
4298 class UCThreeLabelsSlot : public QQuickItem
4299 {
4300 Q_OBJECT
4301+#ifdef Q_QDOC
4302 Q_PROPERTY(UCLabel *title READ title CONSTANT FINAL)
4303 Q_PROPERTY(UCLabel *subtitle READ subtitle CONSTANT FINAL)
4304 Q_PROPERTY(UCLabel *summary READ summary CONSTANT FINAL)
4305+#else
4306+ Q_PROPERTY(UT_PREPEND_NAMESPACE(UCLabel) *title READ title CONSTANT FINAL)
4307+ Q_PROPERTY(UT_PREPEND_NAMESPACE(UCLabel) *subtitle READ subtitle CONSTANT FINAL)
4308+ Q_PROPERTY(UT_PREPEND_NAMESPACE(UCLabel) *summary READ summary CONSTANT FINAL)
4309+#endif
4310
4311 public:
4312 explicit UCThreeLabelsSlot(QQuickItem *parent = 0);
4313@@ -78,5 +87,6 @@
4314 UCLabel *m_summary;
4315 };
4316
4317+UT_NAMESPACE_END
4318
4319 #endif // THREELABELSSLOT_H
4320
4321=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp'
4322--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.cpp 2016-05-25 12:48:10 +0000
4323+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp 2016-06-22 15:52:01 +0000
4324@@ -21,6 +21,8 @@
4325 #include <QQmlEngine>
4326 #include <QQmlContext>
4327
4328+UT_NAMESPACE_BEGIN
4329+
4330 UCPageWrapperPrivate::UCPageWrapperPrivate() :
4331 m_object(nullptr),
4332 m_parentPage(nullptr),
4333@@ -770,4 +772,6 @@
4334 Signal emitted when incubator completes page loading.
4335 */
4336
4337+UT_NAMESPACE_END
4338+
4339 #include "moc_ucpagewrapper.cpp"
4340
4341=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.h'
4342--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.h 2016-04-28 11:19:46 +0000
4343+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.h 2016-06-22 15:52:01 +0000
4344@@ -19,8 +19,10 @@
4345
4346 #include "ucpagetreenode.h"
4347
4348+UT_NAMESPACE_BEGIN
4349+
4350 class UCPageWrapperPrivate;
4351-class UCPageWrapper : public UCPageTreeNode
4352+class UBUNTUTOOLKIT_EXPORT UCPageWrapper : public UCPageTreeNode
4353 {
4354 Q_OBJECT
4355 Q_PROPERTY(QVariant reference READ reference WRITE setReference NOTIFY referenceChanged)
4356@@ -110,4 +112,6 @@
4357 Q_PRIVATE_SLOT(d_func(), void onActiveChanged())
4358 };
4359
4360+UT_NAMESPACE_END
4361+
4362 #endif // UCPAGEWRAPPER_H
4363
4364=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h'
4365--- src/Ubuntu/Components/plugin/privates/ucpagewrapper_p.h 2016-02-18 19:18:13 +0000
4366+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h 2016-06-22 15:52:01 +0000
4367@@ -19,6 +19,8 @@
4368
4369 #include "ucpagetreenode_p.h"
4370
4371+UT_NAMESPACE_BEGIN
4372+
4373 class UCPageWrapper;
4374 class UCPageWrapperIncubator;
4375 class UCPageWrapperPrivate : public UCPageTreeNodePrivate
4376@@ -74,4 +76,6 @@
4377 bool m_ownsComponent:1;
4378 };
4379
4380+UT_NAMESPACE_END
4381+
4382 #endif // UCPAGEWRAPPER_P_H
4383
4384=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp'
4385--- src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator.cpp 2016-02-18 19:18:13 +0000
4386+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp 2016-06-22 15:52:01 +0000
4387@@ -18,6 +18,8 @@
4388 #include <QVariantMap>
4389 #include <QQmlInfo>
4390
4391+UT_NAMESPACE_BEGIN
4392+
4393 /*!
4394 \internal
4395 Incubator wrapper object. Used when page is loaded asynchronously.
4396@@ -59,3 +61,5 @@
4397 }
4398 Q_EMIT statusHasChanged(status);
4399 }
4400+
4401+UT_NAMESPACE_END
4402
4403=== modified file 'src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h'
4404--- src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h 2016-04-28 11:19:46 +0000
4405+++ src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h 2016-06-22 15:52:01 +0000
4406@@ -21,6 +21,9 @@
4407 #include <QQmlIncubator>
4408 #include <QJSValue>
4409 #include <QVariant>
4410+#include <ubuntutoolkitglobal.h>
4411+
4412+UT_NAMESPACE_BEGIN
4413
4414 class UCPageWrapperIncubator : public QObject, public QQmlIncubator
4415 {
4416@@ -56,4 +59,6 @@
4417 QJSValue m_onStatusChanged;
4418 };
4419
4420+UT_NAMESPACE_END
4421+
4422 #endif // UCPAGEWRAPPERINCUBATOR_H
4423
4424=== modified file 'src/Ubuntu/UbuntuToolkit/propertychange.cpp'
4425--- src/Ubuntu/UbuntuToolkit/propertychange.cpp 2016-06-02 12:50:02 +0000
4426+++ src/Ubuntu/UbuntuToolkit/propertychange.cpp 2016-06-22 15:52:01 +0000
4427@@ -21,7 +21,7 @@
4428 #include <QtQml/private/qqmlbinding_p.h> // for QmlBinding
4429 #undef foreach
4430
4431-namespace UbuntuToolkit {
4432+UT_NAMESPACE_BEGIN
4433 /*
4434 * The class is used to save properties and their bindings while the property is
4435 * altered temporarily.
4436@@ -124,4 +124,4 @@
4437 }
4438 }
4439
4440-} // namespace UbuntuToolkit
4441+UT_NAMESPACE_END
4442
4443=== modified file 'src/Ubuntu/UbuntuToolkit/propertychange.h'
4444--- src/Ubuntu/UbuntuToolkit/propertychange.h 2016-06-02 12:50:02 +0000
4445+++ src/Ubuntu/UbuntuToolkit/propertychange.h 2016-06-22 15:52:01 +0000
4446@@ -28,7 +28,7 @@
4447
4448 class QQmlAbstractBinding;
4449
4450-namespace UbuntuToolkit {
4451+UT_NAMESPACE_BEGIN
4452
4453 class UBUNTUTOOLKIT_EXPORT PropertyChange
4454 {
4455@@ -59,6 +59,6 @@
4456 void backup();
4457 };
4458
4459-} // namespace UbuntuToolkit
4460+UT_NAMESPACE_END
4461
4462 #endif // PROPERTYCHANGE_P_H
4463
4464=== renamed file 'src/Ubuntu/Components/plugin/qquickclipboard.cpp' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp'
4465--- src/Ubuntu/Components/plugin/qquickclipboard.cpp 2016-05-25 12:48:10 +0000
4466+++ src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp 2016-06-22 15:52:01 +0000
4467@@ -23,6 +23,8 @@
4468 #include "qquickclipboard_p.h"
4469 #include "qquickmimedata.h"
4470
4471+UT_NAMESPACE_BEGIN
4472+
4473 /*!
4474 * \qmltype Clipboard
4475 * \instantiates QQuickClipboard
4476@@ -196,4 +198,6 @@
4477 d->clipboard->clear(d->mode);
4478 }
4479
4480+UT_NAMESPACE_END
4481+
4482 #include "moc_qquickclipboard.cpp"
4483
4484=== renamed file 'src/Ubuntu/Components/plugin/qquickclipboard.h' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard.h'
4485--- src/Ubuntu/Components/plugin/qquickclipboard.h 2013-01-27 12:47:00 +0000
4486+++ src/Ubuntu/UbuntuToolkit/qquickclipboard.h 2016-06-22 15:52:01 +0000
4487@@ -22,19 +22,27 @@
4488 #include <QtCore/QObject>
4489 #include <QtQml/QJSEngine>
4490 #include <QtQml/QQmlEngine>
4491+#include <ubuntutoolkitglobal.h>
4492
4493-class QQuickMimeData;
4494 class QQmlEngine;
4495 class QJSEngine;
4496+
4497+UT_NAMESPACE_BEGIN
4498+
4499+class QQuickMimeData;
4500 class QQuickClipboardPrivate;
4501-class QQuickClipboard : public QObject
4502+class UBUNTUTOOLKIT_EXPORT QQuickClipboard : public QObject
4503 {
4504 Q_OBJECT
4505+#ifndef Q_QDOC
4506+ Q_PROPERTY(UT_PREPEND_NAMESPACE(QQuickMimeData) *data READ data NOTIFY dataChanged)
4507+#else
4508 Q_PROPERTY(QQuickMimeData *data READ data NOTIFY dataChanged)
4509+#endif
4510 public:
4511 explicit QQuickClipboard(QObject *parent = 0);
4512
4513- Q_INVOKABLE QQuickMimeData *newData();
4514+ Q_INVOKABLE UT_PREPEND_NAMESPACE(QQuickMimeData) *newData();
4515
4516 private: //getter/setter
4517 QQuickMimeData *data();
4518@@ -51,4 +59,6 @@
4519 QScopedPointer<QQuickClipboardPrivate> d_ptr;
4520 };
4521
4522+UT_NAMESPACE_END
4523+
4524 #endif // QQUICKCLIPBOARD_H
4525
4526=== renamed file 'src/Ubuntu/Components/plugin/qquickclipboard_p.h' => 'src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h'
4527--- src/Ubuntu/Components/plugin/qquickclipboard_p.h 2013-01-25 15:45:15 +0000
4528+++ src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h 2016-06-22 15:52:01 +0000
4529@@ -22,6 +22,8 @@
4530 #include "qquickclipboard.h"
4531 #include <QtGui/QClipboard>
4532
4533+UT_NAMESPACE_BEGIN
4534+
4535 class QQuickMimeData;
4536 class QQuickClipboardPrivate {
4537 Q_DECLARE_PUBLIC(QQuickClipboard)
4538@@ -36,4 +38,6 @@
4539 void updateMimeData();
4540 };
4541
4542+UT_NAMESPACE_END
4543+
4544 #endif // QQUICKCLIPBOARD_P_H
4545
4546=== renamed file 'src/Ubuntu/Components/plugin/qquickmimedata.cpp' => 'src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp'
4547--- src/Ubuntu/Components/plugin/qquickmimedata.cpp 2016-05-25 12:48:10 +0000
4548+++ src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp 2016-06-22 15:52:01 +0000
4549@@ -25,9 +25,10 @@
4550
4551 #include <QDebug>
4552
4553+UT_NAMESPACE_BEGIN
4554+
4555 /*!
4556 * \qmltype MimeData
4557- * \instantiates QQuickMimeData
4558 * \inqmlmodule Ubuntu.Components
4559 * \ingroup ubuntu
4560 * \brief MimeData type provides interface to access and store data to the
4561@@ -267,3 +268,5 @@
4562 if (emitSignal)
4563 Q_EMIT dataChanged();
4564 }
4565+
4566+UT_NAMESPACE_END
4567
4568=== renamed file 'src/Ubuntu/Components/plugin/qquickmimedata.h' => 'src/Ubuntu/UbuntuToolkit/qquickmimedata.h'
4569--- src/Ubuntu/Components/plugin/qquickmimedata.h 2013-01-25 15:45:15 +0000
4570+++ src/Ubuntu/UbuntuToolkit/qquickmimedata.h 2016-06-22 15:52:01 +0000
4571@@ -25,7 +25,9 @@
4572 #include <QtCore/QUrl>
4573 #include "qquickclipboard.h"
4574
4575-class QQuickMimeData : public QObject
4576+UT_NAMESPACE_BEGIN
4577+
4578+class UBUNTUTOOLKIT_EXPORT QQuickMimeData : public QObject
4579 {
4580 Q_OBJECT
4581 Q_PROPERTY(QStringList formats READ formats NOTIFY formatsChanged)
4582@@ -70,4 +72,6 @@
4583 QMimeData *m_mimeData;
4584 };
4585
4586+UT_NAMESPACE_END
4587+
4588 #endif // QQUICKMIMEDATA_H
4589
4590=== renamed file 'src/Ubuntu/Components/plugin/quickutils.cpp' => 'src/Ubuntu/UbuntuToolkit/quickutils.cpp'
4591--- src/Ubuntu/Components/plugin/quickutils.cpp 2016-02-24 06:45:27 +0000
4592+++ src/Ubuntu/UbuntuToolkit/quickutils.cpp 2016-06-22 15:52:01 +0000
4593@@ -30,6 +30,8 @@
4594 #include <private/qquicktextinput_p.h>
4595 #include <private/qquicktextedit_p.h>
4596
4597+UT_NAMESPACE_BEGIN
4598+
4599 QuickUtils *QuickUtils::m_instance = nullptr;
4600
4601 QuickUtils::QuickUtils(QObject *parent) :
4602@@ -267,3 +269,5 @@
4603 }
4604 return Q_NULLPTR;
4605 }
4606+
4607+UT_NAMESPACE_END
4608
4609=== renamed file 'src/Ubuntu/Components/plugin/quickutils.h' => 'src/Ubuntu/UbuntuToolkit/quickutils.h'
4610--- src/Ubuntu/Components/plugin/quickutils.h 2016-04-28 11:19:46 +0000
4611+++ src/Ubuntu/UbuntuToolkit/quickutils.h 2016-06-22 15:52:01 +0000
4612@@ -21,11 +21,15 @@
4613 #include <QtCore/QObject>
4614 #include <QtCore/QPointer>
4615 #include <QtQuick/QQuickView>
4616+#include <ubuntutoolkitglobal.h>
4617
4618 class QQuickItem;
4619 class QQmlEngine;
4620 class QQmlComponent;
4621-class QuickUtils : public QObject
4622+
4623+UT_NAMESPACE_BEGIN
4624+
4625+class UBUNTUTOOLKIT_EXPORT QuickUtils : public QObject
4626 {
4627 Q_OBJECT
4628 Q_PROPERTY(QQuickItem *rootObject READ rootObject NOTIFY rootObjectChanged)
4629@@ -91,5 +95,16 @@
4630 void lookupQuickView();
4631 };
4632
4633+#define UC_QML_DEPRECATION_WARNING(msg) \
4634+ { \
4635+ static bool loggedOnce = false; \
4636+ if (!loggedOnce) { \
4637+ if (QuickUtils::showDeprecationWarnings()) { \
4638+ qmlInfo(this) << msg; \
4639+ } \
4640+ } \
4641+ }
4642+
4643+UT_NAMESPACE_END
4644
4645 #endif // QUICKUTILS_P_H
4646
4647=== renamed file 'src/Ubuntu/Components/plugin/plugin.qrc' => 'src/Ubuntu/UbuntuToolkit/resources.qrc'
4648=== renamed directory 'src/Ubuntu/Components/plugin/shaders' => 'src/Ubuntu/UbuntuToolkit/shaders'
4649=== renamed file 'src/Ubuntu/Components/plugin/sortbehavior.cpp' => 'src/Ubuntu/UbuntuToolkit/sortbehavior.cpp'
4650--- src/Ubuntu/Components/plugin/sortbehavior.cpp 2014-06-04 16:59:07 +0000
4651+++ src/Ubuntu/UbuntuToolkit/sortbehavior.cpp 2016-06-22 15:52:01 +0000
4652@@ -19,6 +19,8 @@
4653
4654 #include "sortbehavior.h"
4655
4656+UT_NAMESPACE_BEGIN
4657+
4658 SortBehavior::SortBehavior(QObject *parent)
4659 : QObject(parent)
4660 , m_property(QString())
4661@@ -53,3 +55,4 @@
4662 Q_EMIT orderChanged();
4663 }
4664
4665+UT_NAMESPACE_END
4666
4667=== renamed file 'src/Ubuntu/Components/plugin/sortbehavior.h' => 'src/Ubuntu/UbuntuToolkit/sortbehavior.h'
4668--- src/Ubuntu/Components/plugin/sortbehavior.h 2014-06-04 16:59:07 +0000
4669+++ src/Ubuntu/UbuntuToolkit/sortbehavior.h 2016-06-22 15:52:01 +0000
4670@@ -21,8 +21,11 @@
4671 #define SORTBEHAVIOR_H
4672
4673 #include <QSortFilterProxyModel>
4674-
4675-class SortBehavior : public QObject {
4676+#include <ubuntutoolkitglobal.h>
4677+
4678+UT_NAMESPACE_BEGIN
4679+
4680+class UBUNTUTOOLKIT_EXPORT SortBehavior : public QObject {
4681 Q_OBJECT
4682
4683 Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
4684@@ -45,4 +48,6 @@
4685 Qt::SortOrder m_order;
4686 };
4687
4688+UT_NAMESPACE_END
4689+
4690 #endif // SORTBEHAVIOR_H
4691
4692=== renamed file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp' => 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp'
4693--- src/Ubuntu/Components/plugin/sortfiltermodel.cpp 2016-05-25 12:48:10 +0000
4694+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp 2016-06-22 15:52:01 +0000
4695@@ -20,9 +20,10 @@
4696
4697 #include "sortfiltermodel.h"
4698
4699+UT_NAMESPACE_BEGIN
4700+
4701 /*!
4702 * \qmltype SortFilterModel
4703- * \instantiates QSortFilterProxyModelQML
4704 * \inqmlmodule Ubuntu.Components
4705 * \ingroup ubuntu
4706 * \brief SortFilterModel sorts and filters rows from an existing model.
4707@@ -256,5 +257,7 @@
4708 return result;
4709 }
4710
4711+UT_NAMESPACE_END
4712+
4713 #include "moc_sortfiltermodel.cpp"
4714
4715
4716=== renamed file 'src/Ubuntu/Components/plugin/sortfiltermodel.h' => 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.h'
4717--- src/Ubuntu/Components/plugin/sortfiltermodel.h 2016-04-28 11:19:46 +0000
4718+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.h 2016-06-22 15:52:01 +0000
4719@@ -25,14 +25,16 @@
4720 #include "sortbehavior.h"
4721 #include "filterbehavior.h"
4722
4723+UT_NAMESPACE_BEGIN
4724+
4725 class Q_DECL_EXPORT QSortFilterProxyModelQML : public QSortFilterProxyModel
4726 {
4727 Q_OBJECT
4728
4729 Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
4730 Q_PROPERTY(int count READ count NOTIFY countChanged)
4731- Q_PROPERTY(SortBehavior* sort READ sortBehavior NOTIFY sortChanged)
4732- Q_PROPERTY(FilterBehavior* filter READ filterBehavior NOTIFY filterChanged)
4733+ Q_PROPERTY(UT_PREPEND_NAMESPACE(SortBehavior)* sort READ sortBehavior NOTIFY sortChanged)
4734+ Q_PROPERTY(UT_PREPEND_NAMESPACE(FilterBehavior)* filter READ filterBehavior NOTIFY filterChanged)
4735
4736 public:
4737 explicit QSortFilterProxyModelQML(QObject *parent = 0);
4738@@ -65,4 +67,6 @@
4739 int roleByName(const QString& roleName) const;
4740 };
4741
4742+UT_NAMESPACE_END
4743+
4744 #endif // QSORTFILTERPROXYMODELQML_H
4745
4746=== renamed file 'src/Ubuntu/Components/plugin/statesaverbackend_p.cpp' => 'src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp'
4747--- src/Ubuntu/Components/plugin/statesaverbackend_p.cpp 2016-02-01 18:57:26 +0000
4748+++ src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp 2016-06-22 15:52:01 +0000
4749@@ -31,6 +31,8 @@
4750
4751 #include "unixsignalhandler_p.h"
4752
4753+UT_NAMESPACE_BEGIN
4754+
4755 StateSaverBackend *StateSaverBackend::m_instance = nullptr;
4756
4757 StateSaverBackend::StateSaverBackend(QObject *parent)
4758@@ -246,4 +248,4 @@
4759 return true;
4760 }
4761
4762-
4763+UT_NAMESPACE_END
4764
4765=== renamed file 'src/Ubuntu/Components/plugin/statesaverbackend_p.h' => 'src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h'
4766--- src/Ubuntu/Components/plugin/statesaverbackend_p.h 2016-02-01 13:38:29 +0000
4767+++ src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h 2016-06-22 15:52:01 +0000
4768@@ -25,8 +25,11 @@
4769 #include <QtCore/QSet>
4770 #include <QtCore/QTimer>
4771 #include <QtCore/QStack>
4772-
4773-class StateSaverBackend : public QObject
4774+#include <ubuntutoolkitglobal.h>
4775+
4776+UT_NAMESPACE_BEGIN
4777+
4778+class UBUNTUTOOLKIT_EXPORT StateSaverBackend : public QObject
4779 {
4780 Q_OBJECT
4781 public:
4782@@ -75,4 +78,6 @@
4783 static StateSaverBackend *m_instance;
4784 };
4785
4786+UT_NAMESPACE_END
4787+
4788 #endif // STATESAVERBACKEND_P_H
4789
4790=== renamed file 'src/Ubuntu/Components/plugin/timeutils_p.h' => 'src/Ubuntu/UbuntuToolkit/timeutils_p.h'
4791--- src/Ubuntu/Components/plugin/timeutils_p.h 2015-07-20 15:52:11 +0000
4792+++ src/Ubuntu/UbuntuToolkit/timeutils_p.h 2016-06-22 15:52:01 +0000
4793@@ -24,6 +24,8 @@
4794 #include <QObject>
4795 #include <QTimer>
4796
4797+UT_NAMESPACE_BEGIN
4798+
4799 /* Check the system locale setting to see if the format is 24-hour
4800 time or 12-hour time */
4801 inline bool isLocale12h(void)
4802@@ -138,4 +140,6 @@
4803 return LiveTimer::Disabled;
4804 }
4805
4806+UT_NAMESPACE_END
4807+
4808 #endif // TIMEUTILS_P_H
4809
4810=== modified file 'src/Ubuntu/UbuntuToolkit/tree.cpp'
4811--- src/Ubuntu/UbuntuToolkit/tree.cpp 2016-02-22 08:49:31 +0000
4812+++ src/Ubuntu/UbuntuToolkit/tree.cpp 2016-06-22 15:52:01 +0000
4813@@ -19,7 +19,7 @@
4814 #include <private/qobject_p.h>
4815 #include <QQmlEngine>
4816
4817-namespace UbuntuToolkit {
4818+UT_NAMESPACE_BEGIN
4819
4820 class TreePrivate : public QObjectPrivate
4821 {
4822@@ -228,5 +228,4 @@
4823 return d->m_parents.at(i);
4824 }
4825
4826-}
4827-
4828+UT_NAMESPACE_END
4829
4830=== modified file 'src/Ubuntu/UbuntuToolkit/tree.h'
4831--- src/Ubuntu/UbuntuToolkit/tree.h 2016-02-22 11:06:53 +0000
4832+++ src/Ubuntu/UbuntuToolkit/tree.h 2016-06-22 15:52:01 +0000
4833@@ -21,7 +21,7 @@
4834 #include <QVariant>
4835 #include "ubuntutoolkitglobal.h"
4836
4837-namespace UbuntuToolkit {
4838+UT_NAMESPACE_BEGIN
4839
4840 class TreePrivate;
4841 class UBUNTUTOOLKIT_EXPORT Tree : public QObject
4842@@ -43,6 +43,6 @@
4843 Q_DECLARE_PRIVATE(Tree)
4844 };
4845
4846-}
4847+UT_NAMESPACE_END
4848
4849 #endif // TREE_H
4850
4851=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h'
4852--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h 2016-01-22 09:31:54 +0000
4853+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h 2016-06-22 15:52:01 +0000
4854@@ -24,6 +24,34 @@
4855 # define UBUNTUTOOLKIT_EXPORT Q_DECL_IMPORT
4856 #endif
4857
4858+#define BUILD_VERSION(major, minor) ((((major) & 0x00FF) << 8) | ((minor) & 0x00FF))
4859+#define LATEST_UITK_VERSION BUILD_VERSION(1, 3)
4860+#define MAJOR_VERSION(version) ((version) >> 8)
4861+#define MINOR_VERSION(version) ((version) & 0x00FF)
4862+
4863+#if defined(UBUNTUTOOLKIT_NAMESPACE)
4864+
4865+#define UT_NAMESPACE_BEGIN namespace UbuntuToolkit {
4866+#define UT_NAMESPACE_END }
4867+#define UT_PREPEND_NAMESPACE(name) UbuntuToolkit::name
4868+#define UT_USE_NAMESPACE using namespace UbuntuToolkit;
4869+#define UT_FORWARD_DECLARE_CLASS(name) \
4870+ UT_NAMESPACE_BEGIN class name; UT_NAMESPACE_END \
4871+ using UT_PREPEND_NAMESPACE(name);
4872+#define UT_FORWARD_DECLARE_STRUCT(name) \
4873+ UT_NAMESPACE_BEGIN struct name; UT_NAMESPACE_END \
4874+ using UT_PREPEND_NAMESPACE(name);
4875+
4876+#else // no namespace
4877+
4878+#define UT_NAMESPACE_BEGIN
4879+#define UT_NAMESPACE_END
4880+#define UT_PREPEND_NAMESPACE(name) name
4881+#define UT_USE_NAMESPACE
4882+#define UT_FORWARD_DECLARE_CLASS(name) class name;
4883+#define UT_FORWARD_DECLARE_STRUCT(name) struct name;
4884+
4885+#endif
4886
4887 #endif // UBUNTUTOOLKITGLOBAL_H
4888
4889
4890=== added file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp'
4891--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp 1970-01-01 00:00:00 +0000
4892+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-06-22 15:52:01 +0000
4893@@ -0,0 +1,277 @@
4894+/*
4895+ * Copyright 2016 Canonical Ltd.
4896+ *
4897+ * This program is free software; you can redistribute it and/or modify
4898+ * it under the terms of the GNU Lesser General Public License as published by
4899+ * the Free Software Foundation; version 3.
4900+ *
4901+ * This program is distributed in the hope that it will be useful,
4902+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
4903+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4904+ * GNU Lesser General Public License for more details.
4905+ *
4906+ * You should have received a copy of the GNU Lesser General Public License
4907+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
4908+ *
4909+ * Author: Zsombor Egri <zsombor.egri@canonical.com>
4910+ */
4911+
4912+#include "ubuntutoolkitmodule.h"
4913+#include <QtQml/QQmlEngine>
4914+#include <QtQml/QQmlContext>
4915+#include <QtQuick/private/qquickimagebase_p.h>
4916+#include <QDBusConnection>
4917+#include <QtGui/QGuiApplication>
4918+#include <QtGui/QScreen>
4919+
4920+#include <sys/types.h>
4921+#include <unistd.h>
4922+#include <stdexcept>
4923+
4924+#include <UbuntuToolkit>
4925+
4926+UT_NAMESPACE_BEGIN
4927+
4928+const char *EngineProperty("__ubuntu_toolkit_plugin_data");
4929+
4930+/******************************************************************************
4931+ * UbuntuToolkitModule
4932+ */
4933+UbuntuToolkitModule* UbuntuToolkitModule::create(QQmlEngine *engine, const QUrl &baseUrl)
4934+{
4935+ if (!engine) {
4936+ return Q_NULLPTR;
4937+ }
4938+ UbuntuToolkitModule *data = new UbuntuToolkitModule(engine);
4939+ data->m_baseUrl = QUrl(baseUrl.toString() + '/');
4940+ engine->setProperty(EngineProperty, QVariant::fromValue(data));
4941+ return data;
4942+}
4943+
4944+void UbuntuToolkitModule::registerWindowContextProperty()
4945+{
4946+ setWindowContextProperty(QGuiApplication::focusWindow());
4947+
4948+ // listen to QGuiApplication::focusWindowChanged
4949+ /* Ensure that setWindowContextProperty is called in the same thread (the
4950+ main thread) otherwise it segfaults. Reference:
4951+ https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205556
4952+ */
4953+ QGuiApplication* application = static_cast<QGuiApplication*>(QCoreApplication::instance());
4954+ QObject::connect(application, SIGNAL(focusWindowChanged(QWindow*)),
4955+ this, SLOT(setWindowContextProperty(QWindow*)),
4956+ Qt::ConnectionType(Qt::DirectConnection | Qt::UniqueConnection));
4957+
4958+}
4959+
4960+void UbuntuToolkitModule::setWindowContextProperty(QWindow* focusWindow)
4961+{
4962+ QQuickView* view = qobject_cast<QQuickView*>(focusWindow);
4963+
4964+ if (view != NULL) {
4965+ view->rootContext()->setContextProperty("window", view);
4966+ }
4967+}
4968+
4969+void UbuntuToolkitModule::initializeContextProperties(QQmlEngine *engine)
4970+{
4971+ UCUnits::instance(engine);
4972+ QuickUtils::instance(engine);
4973+ UbuntuI18n::instance(engine);
4974+ UCApplication::instance(engine);
4975+ UCFontUtils::instance(engine);
4976+ UCTheme::defaultTheme(engine);
4977+
4978+ QQmlContext* context = engine->rootContext();
4979+
4980+ // register root object watcher that sets a global property with the root object
4981+ // that can be accessed from any object
4982+ context->setContextProperty("QuickUtils", QuickUtils::instance());
4983+
4984+ UCDeprecatedTheme::registerToContext(context);
4985+
4986+ context->setContextProperty("i18n", UbuntuI18n::instance());
4987+ ContextPropertyChangeListener *i18nChangeListener =
4988+ new ContextPropertyChangeListener(context, "i18n");
4989+ QObject::connect(UbuntuI18n::instance(), SIGNAL(domainChanged()),
4990+ i18nChangeListener, SLOT(updateContextProperty()));
4991+ QObject::connect(UbuntuI18n::instance(), SIGNAL(languageChanged()),
4992+ i18nChangeListener, SLOT(updateContextProperty()));
4993+
4994+ // We can't use 'Application' because it exists (undocumented)
4995+ context->setContextProperty("UbuntuApplication", UCApplication::instance());
4996+ ContextPropertyChangeListener *applicationChangeListener =
4997+ new ContextPropertyChangeListener(context, "UbuntuApplication");
4998+ QObject::connect(UCApplication::instance(), SIGNAL(applicationNameChanged()),
4999+ applicationChangeListener, SLOT(updateContextProperty()));
5000+ // Give the application object access to the engine
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches