← Back to branch summary

~ci-train-bot/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntu-yakkety-landing-094

~ci-train-bot/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntu-yakkety-landing-094

« back to all changes in this revision

Viewing changes to src/Ubuntu/UbuntuGestures/touchregistry.h

Committer: Bileto Bot
Author(s): Tarmac --author=Zoltán Balogh
Date: 2016-06-07 18:24:40 UTC
mfrom: (1000.954.8 OTA12-2016-06-07)
Revision ID: ci-train-bot@canonical.com-20160607182440-8shc9yv12gpbe46j

OTA12-2016-06-07 landing

files removed:
tests/Gallery/Gallery.pro

tests/unit_x11

tests/unit_x11/unit_x11.pro

files renamed:
src/Ubuntu/Components/plugin/propertychange_p.cpp => src/Ubuntu/UbuntuToolkit/propertychange.cpp

src/Ubuntu/Components/plugin/propertychange_p.h => src/Ubuntu/UbuntuToolkit/propertychange.h

tests/unit_x11/add_makecheck.pri => tests/unit/add_makecheck_x11.pri

tests/unit_x11/add_qmlmakecheck.pri => tests/unit/add_qmlmakecheck_x11.pri

tests/unit/tst_alarms/ => tests/unit/alarms/

tests/unit/tst_alarms/tst_alarms.pro => tests/unit/alarms/alarms.pro

tests/unit_x11/tst_animator/ => tests/unit/animator/

tests/unit_x11/tst_animator/tst_animator.pro => tests/unit/animator/animator.pro

tests/unit/tst_argument/ => tests/unit/argument/

tests/unit/tst_argument/tst_argument.pro => tests/unit/argument/argument.pro

tests/unit/tst_arguments/ => tests/unit/arguments/

tests/unit/tst_arguments/tst_arguments.pro => tests/unit/arguments/arguments.pro

tests/unit_x11/tst_asyncloader/ => tests/unit/asyncloader/

tests/unit_x11/tst_asyncloader/tst_asyncloader.pro => tests/unit/asyncloader/asyncloader.pro

tests/unit_x11/tst_bottomedge/ => tests/unit/bottomedge/

tests/unit_x11/tst_bottomedge/tst_bottomedge.pro => tests/unit/bottomedge/bottomedge.pro

tests/unit/tst_components/ => tests/unit/components/

tests/unit/tst_components/tst_components.pro => tests/unit/components/components.pro

tests/unit/tst_components_benchmark/ => tests/unit/components_benchmark/

tests/unit/tst_components_benchmark/tst_components_benchmark.pro => tests/unit/components_benchmark/components_benchmark.pro

tests/unit_x11/tst_deprecated_theme_engine/ => tests/unit/deprecated_theme_engine/

tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro => tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro

tests/unit/tst_i18n/ => tests/unit/i18n/

tests/unit/tst_i18n/tst_i18n_LocalizedApp/ => tests/unit/i18n/LocalizedApp/

tests/unit/tst_i18n/tst_i18n_LocalizedApp/tst_i18n_LocalizedApp.pro => tests/unit/i18n/LocalizedApp/LocalizedApp.pro

tests/unit/tst_i18n/tst_i18n_RelativeTime/ => tests/unit/i18n/RelativeTime/

tests/unit/tst_i18n/tst_i18n_RelativeTime/tst_i18n_RelativeTime.pro => tests/unit/i18n/RelativeTime/RelativeTime.pro

tests/unit/tst_i18n/tst_i18n.pro => tests/unit/i18n/i18n.pro

tests/unit_x11/tst_iconprovider/ => tests/unit/iconprovider/

tests/unit_x11/tst_iconprovider/tst_iconprovider.pro => tests/unit/iconprovider/iconprovider.pro

tests/unit_x11/tst_inversemousearea/ => tests/unit/inversemousearea/

tests/unit_x11/tst_inversemousearea/tst_inversemousearea.pro => tests/unit/inversemousearea/inversemousearea.pro

tests/unit_x11/layout_dependency.pri => tests/unit/layout_dependency.pri

tests/unit_x11/tst_layouts/ => tests/unit/layouts/

tests/unit_x11/tst_layouts/tst_layouts.pro => tests/unit/layouts/layouts.pro

tests/unit/tst_mainview/ => tests/unit/mainview/

tests/unit/tst_mainview/tst_mainview.pro => tests/unit/mainview/mainview.pro

tests/unit_x11/tst_mousefilters/ => tests/unit/mousefilters/

tests/unit_x11/tst_mousefilters/tst_mousefilters.pro => tests/unit/mousefilters/mousefilters.pro

tests/unit_x11/tst_orientation/ => tests/unit/orientation/

tests/unit_x11/tst_orientation/tst_orientation.pro => tests/unit/orientation/orientation.pro

tests/unit_x11/tst_page/ => tests/unit/page/

tests/unit_x11/tst_page/tst_page.pro => tests/unit/page/page.pro

tests/unit/tst_performance/ => tests/unit/performance/

tests/unit/tst_performance/tst_performance.pro => tests/unit/performance/performance.pro

tests/unit/tst_qmltemplate/ => tests/unit/qmltemplate/

tests/unit/tst_qmltemplate/tst_qmltemplate.pro => tests/unit/qmltemplate/qmltemplate.pro

tests/unit_x11/qmltest-include.pri => tests/unit/qmltest-include-x11.pri

tests/unit/tst_qquick_image_extension/ => tests/unit/qquick_image_extension/

tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.pro => tests/unit/qquick_image_extension/qquick_image_extension.pro

tests/unit/tst_quickutils/ => tests/unit/quickutils/

tests/unit/tst_quickutils/tst_quickutils.pro => tests/unit/quickutils/quickutils.pro

tests/unit_x11/tst_recreateview/ => tests/unit/recreateview/

tests/unit_x11/tst_recreateview/tst_recreateview.pro => tests/unit/recreateview/recreateview.pro

tests/unit/tst_scaling_image_provider/ => tests/unit/scaling_image_provider/

tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.pro => tests/unit/scaling_image_provider/scaling_image_provider.pro

tests/unit_x11/tst_serviceproperties/ => tests/unit/serviceproperties/

tests/unit_x11/tst_serviceproperties/tst_serviceproperties.pro => tests/unit/serviceproperties/serviceproperties.pro

tests/unit_x11/tst_statesaver/ => tests/unit/statesaver/

tests/unit_x11/tst_statesaver/tst_statesaver.pro => tests/unit/statesaver/statesaver.pro

tests/unit_x11/tst_subtheming/ => tests/unit/subtheming/

tests/unit_x11/tst_subtheming/tst_subtheming.pro => tests/unit/subtheming/subtheming.pro

tests/unit_x11/tst_swipearea/ => tests/unit/swipearea/

tests/unit_x11/tst_swipearea/tst_swipearea.pro => tests/unit/swipearea/swipearea.pro

tests/unit/tst_template/ => tests/unit/template/

tests/unit/tst_template/tst_template.pro => tests/unit/template/template.pro

tests/unit_x11/test-include.pri => tests/unit/test-include-x11.pri

tests/unit_x11/tst_test/ => tests/unit/test/

tests/unit_x11/tst_test/tst_test.pro => tests/unit/test/test.pro

tests/unit/tst_theme/ => tests/unit/theme/

tests/unit/tst_theme/tst_theme.pro => tests/unit/theme/theme.pro

tests/unit_x11/tst_touchregistry/ => tests/unit/touchregistry/

tests/unit_x11/tst_touchregistry/tst_touchregistry.pro => tests/unit/touchregistry/touchregistry.pro

tests/unit/tst_tree/ => tests/unit/tree/

tests/unit/tst_tree/tst_tree.pro => tests/unit/tree/tree.pro

tests/unit_x11/tst_ubuntu_shape/ => tests/unit/ubuntu_shape/

tests/unit_x11/tst_ubuntu_shape/tst_ubuntu_shape.pro => tests/unit/ubuntu_shape/ubuntu_shape.pro

tests/unit/tst_units/ => tests/unit/units/

tests/unit/tst_units/tst_units.pro => tests/unit/units/units.pro

tests/unit_x11/tst_components/ => tests/unit/visual/

tests/unit_x11/tst_components/tst_textinput_touch.qml => tests/unit/visual/tst_textinput_touch.SEGFAULT.qml

tests/unit_x11/tst_components/tst_components.cpp => tests/unit/visual/tst_visual.cpp

tests/unit_x11/tst_components/tst_components.pro => tests/unit/visual/visual.pro

files modified:
.bzrignore

debian/changelog

debian/control

debian/control.gles

debian/libubuntutoolkit5-dev.install

debian/rules

src/Ubuntu/Components/plugin/plugin.pri

src/Ubuntu/Components/plugin/privates/listitemdraghandler.cpp

src/Ubuntu/Components/plugin/privates/listitemdraghandler.h

src/Ubuntu/Components/plugin/ucbottomedgehint.cpp

src/Ubuntu/Components/plugin/ucbottomedgehint_p.h

src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp

src/Ubuntu/Components/plugin/uclistitem.cpp

src/Ubuntu/Components/plugin/uclistitem.h

src/Ubuntu/Components/plugin/ucstylehints.cpp

src/Ubuntu/Components/plugin/ucstylehints.h

src/Ubuntu/Components/plugin/ucviewitemsattached.cpp

src/Ubuntu/UbuntuGestures/timer.cpp

src/Ubuntu/UbuntuGestures/touchregistry.h

src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro

tests/checkresults.sh

tests/tests.pro

tests/unit/components/tst_pagestack_deprecated_toolbar.qml

tests/unit/custom_qpa/qcustombackingstore.h

tests/unit/runtest.sh

tests/unit/testparser/testparser.pro

tests/unit/unit.pro

tests/unit/visual/tst_focus.qml

ubuntu-sdk.pro

Show diffs side-by-side

added added

removed removed

src/Ubuntu/UbuntuGestures/touchregistry.h

158

158

159

159

class TouchInfo {

160

160

public:

161

TouchInfo() : id(-1) {}

161

TouchInfo() : id(-1), physicallyEnded(false) {}

162

162

TouchInfo(int id);

163

163

bool isValid() const { return id >= 0; }

164

164

void reset();

Older »