← Back to branch summary

~faenil/ubuntu-ui-toolkit/flickableBasedScrollView

~faenil/ubuntu-ui-toolkit/flickableBasedScrollView

« back to all changes in this revision

Viewing changes to examples/ubuntu-ui-toolkit-gallery/gallery-logging.config

Committer: Andrea Bernabei
Date: 2015-11-25 11:50:10 UTC
mfrom: (1681.2.44 staging)
Revision ID: andrea.bernabei@canonical.com-20151125115010-vpxkm2lze1hav9q9

merge upstream

files added:
debian/libubuntugestures-dev.install

debian/libubuntugestures.install

examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml

examples/ubuntu-ui-toolkit-gallery/gallery-logging.config

features/ubuntu_qt_module.prf

src/Ubuntu/Components/plugin/gestures

src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp

src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h

src/Ubuntu/Components/plugin/gestures/damper.cpp

src/Ubuntu/Components/plugin/gestures/damper.h

src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h

src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp

src/Ubuntu/Components/plugin/gestures/ucswipearea.h

src/Ubuntu/Components/plugin/gestures/ucswipearea_p.h

src/Ubuntu/Components/plugin/ucmathutils.cpp

src/Ubuntu/Components/plugin/ucmathutils.h

src/Ubuntu/Test/plugin/ucmousetouchadaptor.cpp

src/Ubuntu/Test/plugin/ucmousetouchadaptor.h

src/Ubuntu/UbuntuGestures

src/Ubuntu/UbuntuGestures/UbuntuGestures.pro

src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp

src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h

src/Ubuntu/UbuntuGestures/debughelpers.cpp

src/Ubuntu/UbuntuGestures/debughelpers.h

src/Ubuntu/UbuntuGestures/pool.h

src/Ubuntu/UbuntuGestures/timer.cpp

src/Ubuntu/UbuntuGestures/timer.h

src/Ubuntu/UbuntuGestures/timesource.cpp

src/Ubuntu/UbuntuGestures/timesource.h

src/Ubuntu/UbuntuGestures/touchownershipevent.cpp

src/Ubuntu/UbuntuGestures/touchownershipevent.h

src/Ubuntu/UbuntuGestures/touchregistry.cpp

src/Ubuntu/UbuntuGestures/touchregistry.h

src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h

src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp

src/Ubuntu/UbuntuGestures/unownedtouchevent.h

sync.profile

tests/unit_x11/tst_swipearea

tests/unit_x11/tst_swipearea/DownwardsLauncher.qml

tests/unit_x11/tst_swipearea/GestureTest.cpp

tests/unit_x11/tst_swipearea/GestureTest.h

tests/unit_x11/tst_swipearea/LeftwardsLauncher.qml

tests/unit_x11/tst_swipearea/RightwardsLauncher.qml

tests/unit_x11/tst_swipearea/UpwardsLauncher.qml

tests/unit_x11/tst_swipearea/tst_swipearea.cpp

tests/unit_x11/tst_swipearea/tst_swipearea.pro

tests/unit_x11/tst_swipearea/tst_swipearea.qml

tests/unit_x11/tst_touchregistry

tests/unit_x11/tst_touchregistry/tst_TouchRegistry.cpp

tests/unit_x11/tst_touchregistry/tst_touchregistry.pro

files removed:
src/Ubuntu/Components/1.2/mathUtils.js

src/Ubuntu/Components/1.3/mathUtils.js

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

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

files renamed:
src/Ubuntu/Components/1.2/scrollbarUtils.js => src/Ubuntu/Components/1.2/scrollbarUtils.js.THIS

files modified:
components.api

debian/control

documentation/overview.qdoc

examples/ubuntu-ui-toolkit-gallery/MainPage.qml

examples/ubuntu-ui-toolkit-gallery/Template.qml

examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml

examples/ubuntu-ui-toolkit-gallery/gallery

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro

export_modules_dir.sh

features/ubuntu_qml_plugin.prf

src/Ubuntu/Components/1.2/DraggingArea.qml

src/Ubuntu/Components/1.2/Slider.qml

src/Ubuntu/Components/1.2/TextArea.qml

src/Ubuntu/Components/1.3/DraggingArea.qml

src/Ubuntu/Components/1.3/Slider.qml

src/Ubuntu/Components/1.3/TextField.qml

src/Ubuntu/Components/ComponentModule.pro

src/Ubuntu/Components/Themes/Ambiance/1.2/ScrollbarStyle.qml

src/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml

src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml

src/Ubuntu/Components/plugin/plugin.cpp

src/Ubuntu/Components/plugin/plugin.pri

src/Ubuntu/Components/plugin/ucbottomedgehint.cpp

src/Ubuntu/Components/plugin/ucbottomedgehint.h

src/Ubuntu/Components/plugin/ucheader.cpp

src/Ubuntu/Components/qmldir

src/Ubuntu/Test/plugin/plugin.pri

src/Ubuntu/Test/plugin/testplugin.cpp

src/Ubuntu/Test/plugin/uctestcase.cpp

src/Ubuntu/Test/plugin/uctestcase.h

src/Ubuntu/Test/plugin/uctestextras.h

src/src.pro

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py

tests/license/checklicense.sh

tests/qmlapicheck.sh

tests/unit/add_makecheck.pri

tests/unit/add_qmlmakecheck.pri

tests/unit/tst_components/tst_math_utils.qml

tests/unit_x11/add_makecheck.pri

tests/unit_x11/add_qmlmakecheck.pri

tests/unit_x11/test-include.pri

tests/unit_x11/tst_components/tst_bottomedgehint.qml

tests/unit_x11/tst_components/tst_header.qml

tests/unit_x11/tst_components/tst_textinput_common13.qml

tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp

tests/unit_x11/tst_subtheming/tst_subtheming.cpp

tests/unit_x11/unit_x11.pro

ubuntu-sdk.pro

ubuntu-ui-toolkit-launcher/launcher.cpp

Show diffs side-by-side

added added

removed removed

examples/ubuntu-ui-toolkit-gallery/gallery-logging.config

1

[Rules]

2

libubuntugestures.TouchRegistry.debug=false

3

ubuntu.components.SwipeArea.debug=false

4

ubuntu.components.SwipeArea.ActiveTouchInfo.debug=false

Older »