lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-metrics

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 2065

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-08-17

Zsombor Egri: Approve on 2016-08-17

Zoltan Balogh: Approve on 2016-08-16

Diff: 45537 lines (+45169/-36)

36 files modified

debian/bileto_convert_to_gles (+1/-1)
debian/control (+36/-0)
debian/control.gles (+34/-0)
debian/libubuntumetrics5-dev.install (+14/-0)
debian/libubuntumetrics5-private-dev.install (+1/-0)
debian/libubuntumetrics5.install (+1/-0)
documentation/overview.qdoc (+0/-7)
src/Ubuntu/Components/1.3/MainView.qml (+0/-5)
src/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml (+2/-0)
src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro (+37/-0)
src/Ubuntu/UbuntuMetrics/applicationmonitor.cpp (+869/-0)
src/Ubuntu/UbuntuMetrics/applicationmonitor.h (+101/-0)
src/Ubuntu/UbuntuMetrics/applicationmonitor_p.h (+215/-0)
src/Ubuntu/UbuntuMetrics/bitmaptext.cpp (+422/-0)
src/Ubuntu/UbuntuMetrics/bitmaptext_p.h (+98/-0)
src/Ubuntu/UbuntuMetrics/bitmaptextfont_p.h (+41241/-0)
src/Ubuntu/UbuntuMetrics/events.cpp (+155/-0)
src/Ubuntu/UbuntuMetrics/events.h (+141/-0)
src/Ubuntu/UbuntuMetrics/events_p.h (+43/-0)
src/Ubuntu/UbuntuMetrics/gputimer.cpp (+268/-0)
src/Ubuntu/UbuntuMetrics/gputimer_p.h (+110/-0)
src/Ubuntu/UbuntuMetrics/logger.cpp (+205/-0)
src/Ubuntu/UbuntuMetrics/logger.h (+59/-0)
src/Ubuntu/UbuntuMetrics/logger_p.h (+46/-0)
src/Ubuntu/UbuntuMetrics/overlay.cpp (+584/-0)
src/Ubuntu/UbuntuMetrics/overlay_p.h (+85/-0)
src/Ubuntu/UbuntuMetrics/tools/bitmaptextbuilder/bitmaptextbuilder.cpp (+189/-0)
src/Ubuntu/UbuntuMetrics/tools/bitmaptextbuilder/bitmaptextbuilder.pro (+4/-0)
src/Ubuntu/UbuntuMetrics/ubuntumetricsglobal.h (+29/-0)
src/Ubuntu/UbuntuMetrics/ubuntumetricsglobal_p.h (+54/-0)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+1/-1)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+39/-0)
src/src.pro (+21/-11)
sync.profile (+1/-0)
ubuntu-ui-toolkit-launcher/launcher.cpp (+53/-7)
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro (+10/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2063. By Loïc Molinari on 2016-08-05

Removed incorrect "// static" marker.

2062. By Loïc Molinari on 2016-08-05

Marked private classes as private export.

2061. By Loïc Molinari on 2016-08-05

Added missing doc.

2060. By Loïc Molinari on 2016-08-05

Fixed indentation.

2059. By Loïc Molinari on 2016-08-04

Fixed src.pro dependencies.

2058. By Loïc Molinari on 2016-08-04

Fixed OpenGL ES i386 build.

2057. By Loïc Molinari on 2016-08-04

Merged lp:ubuntu-ui-toolkit/staging.

2056. By Loïc Molinari on 2016-08-04

Removed useless INCLUDEPATH from .pro.

2055. By Loïc Molinari on 2016-08-04

Updated launcher description.

2054. By Loïc Molinari on 2016-08-04

Made UMApplicationMonitor a singleton and updated API.